packaging 0.109.0 → 0.109.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11bd7673d3f37ddab90b44202787f13882b390ffb4acbb858b3161166f0d2d0e
-  data.tar.gz: 4623cd4dd183c885ac2984fcb31d403629b2a8e1b294fade1ee918862a978f04
+  metadata.gz: 21fbe7adf35d302cad689b2f4ca536f499c6d805e33da1ec091c7b7dcd672ffc
+  data.tar.gz: dccc381590b0cec0ad69b413b2c9680c1d95fe6bbcd041073e179faae9693134
 SHA512:
-  metadata.gz: b495a1512b62e06c39405daaa6a89c09dcea8350006ef6321af2084f01e04b6c97dd41f80bb8ec8592d7b4fe875b1491ae5deee1b45b4bdb99b6888a586dfbee
-  data.tar.gz: f448461101f22184101346cddba0650932796d4dff63fc7ce716f13592c29ff1c417f5908226c3184095067c6aecb32dff6cf069d9274d701c5e559aa0e73079
+  metadata.gz: 81e93d2e4375be0ead7790a7cef9bb17e395b0e4ada9ee67926e5f422e24cfdc079cb5a51f3fc5bac87bccc1b6520cf09355eb99796be2df118ae352c8204daa
+  data.tar.gz: 5083b56f76a63f2c2e825a45ee87fdeac1ed2d19cd4adfa7046f8133339cd1212d0377878ca3dede7d984a3506c64b421b7aafb0c4ea71e16a890d79e2bab2a7

data/lib/packaging/util/file.rb

@@ -58,7 +58,14 @@ module Pkg::Util::File
 
     def erb_string(erbfile, b = binding)
       template = File.read(erbfile)
-      message  = ERB.new(template, trim_mode: "-")
+
+      # We should be using this but some images are pegged at Ruby <= 2.5; this interface
+      # changed at Ruby 2.6
+      # message  = ERB.new(template, safe_level: nil, trim_mode: '-')
+
+      # rubocop:disable Lint/ErbNewArguments
+      message = ERB.new(template, nil, '-')
+      # rubocop:enable Lint/ErbNewArguments
       message.result(b)
     end
 

data/tasks/ship.rake

@@ -124,32 +124,41 @@ namespace :pl do
 
     desc "Update remote ips repository on #{Pkg::Config.ips_host}"
     task :update_ips_repo => 'pl:fetch' do
-      if Dir['pkg/ips/pkgs/**/*'].empty? && Dir['pkg/solaris/11/**/*'].empty?
-        $stdout.puts "Error: there aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11."
+      # This could be pkg/ips/pkgs/{i386,sparc} or pkg/solaris/11/{i386,sparc}
+      p5p_files = Dir.glob('pkg/**/*.p5p')
+      if p5p_files.empty?
+        puts "Error: there aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11."
         next
       end
 
-      source_dir = 'pkg/solaris/11/'
-      source_dir = 'pkg/ips/pkgs/' unless Dir['pkg/ips/pkgs/**/*'].empty?
-
-      tmpdir, = Pkg::Util::Net.remote_execute(
+      # This makes the historical assumption that all p5p files we want to ship exist in
+      # just one directory.
+      source_directory = File.dirname(p5p_files.first)
+      remote_working_directory = Pkg::Util::Net.remote_execute(
         Pkg::Config.ips_host,
-                'mktemp -d -p /var/tmp',
-                { capture_output: true }
-      )
-      tmpdir.chomp!
+        'mktemp -d -p /var/tmp',
+        { capture_output: true }
+      )[0].chomp
 
-      Pkg::Util::Net.rsync_to(source_dir, Pkg::Config.ips_host, tmpdir)
+      Pkg::Util::Net.rsync_to(
+        "#{source_directory}/",
+        Pkg::Config.ips_host, remote_working_directory
+      )
 
-      remote_cmd = %(for pkg in #{tmpdir}/*.p5p; do
-        sudo pkgrecv -s $pkg -d #{Pkg::Config.ips_path} '*';
+      pkgrecv_scriptlet = %(for p5p_file in #{remote_working_directory}/*.p5p; do
+        sudo pkgrecv -s $p5p_file -d #{Pkg::Config.ips_path} '*';
       done)
 
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, remote_cmd)
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host,
-        "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}")
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host,
-        "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{Pkg::Config.ips_repo || 'default'}")
+      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, pkgrecv_scriptlet)
+      Pkg::Util::Net.remote_execute(
+        Pkg::Config.ips_host,
+        "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}"
+      )
+      ips_repository = Pkg::Config.ips_repo || 'default'
+      Pkg::Util::Net.remote_execute(
+        Pkg::Config.ips_host,
+        "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{ips_repository}"
+      )
     end
 
     desc "Move dmg repos from #{Pkg::Config.dmg_staging_server} to #{Pkg::Config.dmg_host}"
@@ -683,7 +692,7 @@ namespace :pl do
         existing_artifacts = artifactory.artifact_paths(artifact)
         unless existing_artifacts.empty?
           warn "Uploading '#{artifact}' to Artifactory refused. Artifact already exists here: ",
-               existing_artifacts.join(', ')
+               existing_artifacts.map(&:uri).join(', ')
           next
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.109.0
+  version: 0.109.2
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug