Skip to content

Commit 10318df

Browse files
authored
updatinf diff-lcs in main (#284)
Signed-off-by: nikhil2611 <[email protected]>
1 parent 131ca43 commit 10318df

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

chef-cli.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Gem::Specification.new do |gem|
4747
gem.add_dependency "solve", "< 5.0", "> 2.0"
4848
gem.add_dependency "addressable", ">= 2.3.5", "< 2.9"
4949
gem.add_dependency "cookbook-omnifetch", "~> 0.5"
50-
gem.add_dependency "diff-lcs", ">= 1.0", "< 1.4" # 1.4 changes the output
50+
gem.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff
5151
gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
5252
gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
5353
gem.add_dependency "chef-licensing", "~> 1.0"

spec/unit/policyfile/differ_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def output
318318
REVISION ID CHANGED
319319
===================
320320
321-
@@ -1,2 +1,2 @@
321+
@@ -1 +1 @@
322322
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
323323
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
324324
@@ -369,7 +369,7 @@ def output
369369
REVISION ID CHANGED
370370
===================
371371
372-
@@ -1,2 +1,2 @@
372+
@@ -1 +1 @@
373373
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
374374
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
375375
@@ -428,7 +428,7 @@ def output
428428
REVISION ID CHANGED
429429
===================
430430
431-
@@ -1,2 +1,2 @@
431+
@@ -1 +1 @@
432432
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
433433
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
434434
@@ -501,7 +501,7 @@ def output
501501
REVISION ID CHANGED
502502
===================
503503
504-
@@ -1,2 +1,2 @@
504+
@@ -1 +1 @@
505505
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
506506
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
507507
@@ -511,7 +511,7 @@ def output
511511
bluepill
512512
--------
513513
514-
@@ -1 +1,12 @@
514+
@@ -1,11 +1,22 @@
515515
+{
516516
+ "version": "2.3.2",
517517
+ "identifier": "9c6990944d9a347dec8bd375e707ba0aecdc17cd",
@@ -563,7 +563,7 @@ def output
563563
REVISION ID CHANGED
564564
===================
565565
566-
@@ -1,2 +1,2 @@
566+
@@ -1 +1 @@
567567
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
568568
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
569569
@@ -616,7 +616,7 @@ def output
616616
REVISION ID CHANGED
617617
===================
618618
619-
@@ -1,2 +1,2 @@
619+
@@ -1 +1 @@
620620
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
621621
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
622622
@@ -662,7 +662,7 @@ def output
662662
REVISION ID CHANGED
663663
===================
664664
665-
@@ -1,2 +1,2 @@
665+
@@ -1 +1 @@
666666
-cf4b8a020bdc1ba6914093a8a07a5514cce8a3a2979a967b1f32ea704a61785b
667667
+304566f86a620aae85797a3c491a51fb8c6ecf996407e77b8063aa3ee59672c5
668668

0 commit comments

Comments
 (0)