simp-rake-helpers 5.12.5 → 5.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af430b5f3668ec96a8f12d66b7210e176083e9377ccfefd06fa92050ee56f77a
-  data.tar.gz: 423871d8e7f99d01d6065809ea1cfea2b76abae47b84add3197b982d042b3de3
+  metadata.gz: 51d1aeb754d81247df05b01fce650e64c4b03fdab941f955e3180e79edcc2964
+  data.tar.gz: e8d8c2ef11a657dfce5bd7755d94f024bd2466fbad243f930f6624bc7e699955
 SHA512:
-  metadata.gz: 9424b979c1f67e6fba2ecedb6c8229e111c017a987f69ee7c9eea7db60d715b23530c91bd8baf01d44e11f0e1b16c73d016c13905c87e7f5540b7c5b072ab7bd
-  data.tar.gz: 9c43ca061b10e4241695b108af43a27c20e06f430d1cdaf349cd15e68333ee5f389e7f74427e9ab495cfc3f52df4786bf576ce99d00e66356c24db4b5d6694f0
+  metadata.gz: ff5da7ac89c5cf55ae28d69be89992a904e0341c33534e3e301eee6a409d7f801d2df49a2de8dc889e46eb1defb42233c5e707bf8d67c215972998f2a483272a
+  data.tar.gz: 9a3bc2da54cc811be5c3129665124c90761f0c7a962ab54a1c8b11722e506b0691a7d429492e1d30d29930d082af942472dd7984b1bb674d5fe7c0c34928179a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 5.12.6 / 2021-10-19
+- Ensure that the `Updates` directory does not link to files in itself
+
 ### 5.12.5 / 2021-10-07
 - Fixed a bug where `build:auto` failed when building the SIMP ISO for EL7,
   because the code attempted to move a directory onto itself.

data/lib/simp/rake/build/build.rb

@@ -282,7 +282,7 @@ module Simp::Rake::Build
         Error: Could not find anything to do!
 
         In #{target_dir}:
-            No packages in either packages.yaml or the packages/ directory
+            No packages in either packages.yaml or the packages/ directory and no repos found in the reposync/ directory
                 EOM
               end
 

data/lib/simp/rake/build/iso.rb

@@ -363,7 +363,12 @@ module Simp::Rake::Build
                     # to exclude
                     next if rpm.match(%r{/SimpRepos|/SIMP})
 
-                    ln_sf(rpm, '.', :verbose => verbose)
+                    rpm_dest = File.basename(rpm)
+                    if File.exist?(rpm) && File.exist?(rpm_dest)
+                      next if (File.realpath(rpm) == File.realpath(rpm_dest))
+                    end
+
+                    ln_sf(rpm, rpm_dest, :verbose => verbose)
                   end
                 end
 

data/lib/simp/rake/build/pkg.rb

@@ -643,7 +643,8 @@ protect=1
                 file.write(ERB.new(yum_conf_template,nil,'-').result(binding))
               end
 
-              if which('dnf')
+              dnf_system = which('dnf')
+              if dnf_system
                 cmd = 'repoclosure -c base.conf --disablerepo=* --enablerepo=base'
               else
                 cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
@@ -661,7 +662,16 @@ protect=1
               if (!$?.success? || (repoclosure_output =~ /nresolved/))
                 errmsg = ['Error: REPOCLOSURE FAILED:']
                 errmsg << [repoclosure_output]
-                fail(errmsg.join("\n"))
+                puts(errmsg.join("\n"))
+
+                if dnf_system
+                  if ENV.fetch('SIMP_BUILD_prompt', 'yes') != 'no'
+                    puts('- Press any key to continue or ^C to abort -')
+                    $stdin.gets
+                  end
+                else
+                  fail('Repoclosure Failed')
+                end
               end
             end
           end

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.12.5'
+  VERSION = '5.12.6'
 end

data/lib/simp/rpm_signer.rb

@@ -195,8 +195,13 @@ class Simp::RpmSigner
               # the first RPM to be signed with the key after the gpg-agent is
               # started and the key's passphrase has not been cleared from the
               # agent's cache.
-              read.expect(/pass\s?phrase:.*/) do |text|
-                write.puts(gpgkey[:password])
+              read.expect(/(pass\s?phrase:|verwrite).*/) do |text|
+                if text.last.include?('verwrite')
+                  write.puts('y')
+                else
+                  write.puts(gpgkey[:password])
+                end
+
                 write.flush
               end
             end
@@ -287,7 +292,7 @@ class Simp::RpmSigner
     begin
       results = Parallel.map(
         to_sign,
-        :in_processes => opts[:max_concurrent],
+        :in_processes => 1,
         :progress => opts[:progress_bar_title]
       ) do |rpm|
         _result = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.12.5
+  version: 5.12.6
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers