diff options
author | John McCrae <john.mccrae@progress.com> | 2023-04-26 07:39:22 +0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-26 07:39:22 +0600 |
commit | be5d22100a80e736949069d29a96f3bc248c5f45 (patch) | |
tree | 332d72cc85a47d6caa12574a7352b06198822147 | |
parent | ef039bc96ef0476324126f6e1e644ed3f3762b2d (diff) | |
parent | f9bc3a42607196d02dbb6c6ed9ebe17ac7fc2855 (diff) | |
download | chef-be5d22100a80e736949069d29a96f3bc248c5f45.tar.gz |
Merge pull request #13710 from chef/jfm/chef17_verify_plan
[Chef-17] 12 of X - Correcting Windows Verify Plan failures
-rw-r--r-- | habitat/plan.ps1 | 4 | ||||
-rw-r--r-- | spec/functional/assets/yumrepo/repodata/01a3b-filelists.sqlite.bz2 (renamed from spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2) | bin | 1322 -> 1322 bytes | |||
-rw-r--r-- | spec/functional/assets/yumrepo/repodata/401dc-filelists.xml.gz (renamed from spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz) | bin | 529 -> 529 bytes | |||
-rw-r--r-- | spec/functional/assets/yumrepo/repodata/5dc1e-primary.sqlite.bz2 (renamed from spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2) | bin | 2569 -> 2569 bytes | |||
-rw-r--r-- | spec/functional/assets/yumrepo/repodata/6bf96-other.xml.gz (renamed from spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz) | bin | 502 -> 502 bytes | |||
-rw-r--r-- | spec/functional/assets/yumrepo/repodata/7c365-other.sqlite.bz2 (renamed from spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2) | bin | 1115 -> 1115 bytes | |||
-rw-r--r-- | spec/functional/assets/yumrepo/repodata/dabe2-primary.xml.gz (renamed from spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz) | bin | 966 -> 966 bytes |
7 files changed, 2 insertions, 2 deletions
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 92fedfbc60..4dced59006 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -94,10 +94,10 @@ function Invoke-Build { } } Write-BuildLine " ** Running the chef project's 'rake install' to install the path-based gems so they look like any other installed gem." - bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler + bundle exec rake install:local --trace=stdout # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler if (-not $?) { Write-Warning " -- That didn't work. Let's try again." - bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler + bundle exec rake install:local --trace=stdout # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler if (-not $?) { throw "unable to install the gems that live in directories within this repo" } } } finally { diff --git a/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 b/spec/functional/assets/yumrepo/repodata/01a3b-filelists.sqlite.bz2 Binary files differindex 3c5e406935..3c5e406935 100644 --- a/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +++ b/spec/functional/assets/yumrepo/repodata/01a3b-filelists.sqlite.bz2 diff --git a/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz b/spec/functional/assets/yumrepo/repodata/401dc-filelists.xml.gz Binary files differindex 9636d5b868..9636d5b868 100644 --- a/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +++ b/spec/functional/assets/yumrepo/repodata/401dc-filelists.xml.gz diff --git a/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 b/spec/functional/assets/yumrepo/repodata/5dc1e-primary.sqlite.bz2 Binary files differindex 50bbe1f37f..50bbe1f37f 100644 --- a/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +++ b/spec/functional/assets/yumrepo/repodata/5dc1e-primary.sqlite.bz2 diff --git a/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz b/spec/functional/assets/yumrepo/repodata/6bf96-other.xml.gz Binary files differindex ddccd353ae..ddccd353ae 100644 --- a/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +++ b/spec/functional/assets/yumrepo/repodata/6bf96-other.xml.gz diff --git a/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 b/spec/functional/assets/yumrepo/repodata/7c365-other.sqlite.bz2 Binary files differindex e341e1df69..e341e1df69 100644 --- a/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +++ b/spec/functional/assets/yumrepo/repodata/7c365-other.sqlite.bz2 diff --git a/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz b/spec/functional/assets/yumrepo/repodata/dabe2-primary.xml.gz Binary files differindex afa4b4db9a..afa4b4db9a 100644 --- a/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +++ b/spec/functional/assets/yumrepo/repodata/dabe2-primary.xml.gz |