packaging 0.106.0 → 0.106.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8f591fe70bfaa1b456f862d1898608ac697a17fd6875f03bf9ccc3a70aca0f
-  data.tar.gz: 5d14a9da028019e933ffe9b723170d222bd7684aeacc85081f7002ac683739d6
+  metadata.gz: db83755518bc81f835ca1c1b64cb4fa7febab19049e584aabcc77ddf049a0baa
+  data.tar.gz: 16139b7c1e409444034c8eda4481c96fdb2b63a0a46fa1a2aeed3d50951fae15
 SHA512:
-  metadata.gz: bd7b31167dcd20809a694b8366493be1e2ab67138d97c90ad283ca4852ecca37c6726642bb20e9ac83a0b97d606a780825e4133d9cffa357e602ea0d1e96d779
-  data.tar.gz: ab8c6af7044c77070b5568023beb9962506622cb90d472d07d795deb8d6b99abea94cf29077e6e5ee71990f20aa1d0672dab83a7c1192a9845c580407a4f3259
+  metadata.gz: d33084fee800fe837b891703dbdf2bc404e1aabb23a965704ea5275c0c08a397daabc20aab2cce63babb9040088de855a4dbc3846b0ec78e96cab13c89299768
+  data.tar.gz: 3cd7163d6acc73d96f062924938a31ec46dafecf717f0fcbceb4d1c56e4ae6d2a9af05fdc0904f4a790673a30d3a2c3f85772c5137ffd4e4d80fc9efbbc5c597

data/README.md

@@ -433,18 +433,18 @@ build_doc: false
 build_msi:
   puppet_for_the_win:
     ref: 'origin/master'
-    repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
+    repo: 'https://github.com/puppetlabs/puppet_for_the_win.git'
   facter:
     ref: 'refs/tags/2.1.0'
-    repo: 'git://github.com/puppetlabs/facter.git'
+    repo: 'https://github.com/puppetlabs/facter.git'
   hiera:
     ref: 'refs/tags/1.3.4'
-    repo: 'git://github.com/puppetlabs/hiera.git'
+    repo: 'https://github.com/puppetlabs/hiera.git'
   sys:
     ref:
       x86: 'origin/1.9.3-x86'
       x64: 'origin/2.0.0-x64'
-    repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
+    repo: 'https://github.com/puppetlabs/puppet-win32-ruby.git'
 # Whether to present the Solaris 11 IPS packaging tasks
 # This requires suitable IPS packaging artifacts in the project in ext/ips
 build_ips: false

data/lib/packaging/archive.rb

@@ -3,12 +3,12 @@ module Pkg::Archive
 
   # Array of base paths for foss artifacts on weth
   def base_paths
-    [Pkg::Config.yum_repo_path, Pkg::Config.apt_repo_staging_path, Pkg::Config.apt_repo_path, '/opt/downloads'].compact.freeze
+    [Pkg::Config.yum_repo_path, Pkg::Config.apt_repo_staging_path, Pkg::Config.apt_repo_path, '/opt/downloads'].compact
   end
 
   # Array of paths for temporarily staging artifacts before syncing to release-archives on s3
   def archive_paths
-    [Pkg::Config.yum_archive_path, Pkg::Config.apt_archive_path, Pkg::Config.freight_archive_path, Pkg::Config.downloads_archive_path, '/opt/tmp-apt'].compact.freeze
+    [Pkg::Config.yum_archive_path, Pkg::Config.apt_archive_path, Pkg::Config.freight_archive_path, Pkg::Config.downloads_archive_path, '/opt/tmp-apt'].compact
   end
 
   # Move yum directories from repo path to archive staging path

data/lib/packaging/artifactory/extensions.rb

@@ -46,6 +46,7 @@ module ArtifactoryExtensions
       unless repo_uri.include?('/api/storage/')
         # rubocop:disable Style/PercentLiteralDelimiters
         repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
+        # rubocop:enable Style/PercentLiteralDelimiters
       end
       response['files'].map do |file_path|
         from_url("#{repo_uri}/#{file_path}", client: client)

data/lib/packaging/artifactory.rb

@@ -5,13 +5,11 @@ require 'digest'
 require 'packaging/artifactory/extensions'
 
 module Pkg
-
   # The Artifactory class
   # This class provides automation to access the artifactory repos maintained
   # by the Release Engineering team at Puppet. It has the ability to both push
   # artifacts to the repos, and to retrieve them back from the repos.
   class ManageArtifactory
-
     # The Artifactory property that the artifactCleanup user plugin
     # {https://github.com/jfrog/artifactory-user-plugins/tree/master/cleanup/artifactCleanup}
     # uses to tell it to not clean a particular artifact
@@ -233,8 +231,8 @@ module Pkg
     # @return [String] The contents of the YAML file
     def retrieve_yaml_data(pkg, ref)
       yaml_url = "#{@artifactory_uri}/#{DEFAULT_REPO_TYPE}/#{DEFAULT_REPO_BASE}/#{pkg}/#{ref}/#{ref}.yaml"
-      open(yaml_url) { |f| f.read }
-    rescue
+      URI.open(yaml_url, &:read)
+    rescue StandardError
       raise "Failed to load YAML data for #{pkg} at #{ref} from #{yaml_url}!"
     end
 
@@ -245,7 +243,7 @@ module Pkg
     #   project_version, and platform_tag
     def package_name(platform_data, platform_tag)
       return File.basename(platform_data[platform_tag][:artifact])
-    rescue
+    rescue StandardError
       fail_message = <<-DOC
   Package name could not be found from loaded yaml data. Either this package
   does not exist, or '#{platform_tag}' is not present in this dataset.
@@ -267,7 +265,7 @@ module Pkg
       packages.flatten!
       packages.reject! { |package| package.nil? || package.empty? }
       packages.map { |package| File.basename(package) }
-    rescue
+    rescue StandardError
       fail_message = <<-DOC
   Package name could not be found from loaded yaml data. Either this package
   does not exist, or '#{platform_tag}' is not present in this dataset.
@@ -294,13 +292,14 @@ module Pkg
     def promote_package(pkg, ref, platform_tag, repository, debian_component = nil)
       # load package metadata
       yaml_content = retrieve_yaml_data(pkg, ref)
-      yaml_data = YAML::load(yaml_content)
+      yaml_data = YAML::safe_load(yaml_content, [Symbol])
 
       # get the artifact name
       artifact_names = all_package_names(yaml_data[:platform_data], platform_tag)
       artifact_names.each do |artifact_name|
         artifact_search_results = Artifactory::Resource::Artifact.search(
-          name: artifact_name, :artifactory_uri => @artifactory_uri)
+          name: artifact_name, :artifactory_uri => @artifactory_uri
+        )
 
         if artifact_search_results.empty?
           raise "Error: could not find PKG=#{pkg} at REF=#{ref} for #{platform_tag}"
@@ -332,10 +331,10 @@ module Pkg
           if e.message =~ /(destination and source are the same|user doesn't have permissions to override)/i
             puts "Skipping promotion of #{artifact_name}; it has already been promoted"
           else
-            puts "#{e.message}"
+            puts e.message.to_s
             raise e
           end
-        rescue => e
+        rescue StandardError => e
           puts "Something went wrong promoting #{artifact_name}!"
           raise e
         end
@@ -352,17 +351,21 @@ module Pkg
     #        Used to specify which subdirectories packages will be downloaded from.
     def download_packages(staging_directory, manifest, remote_path = '')
       check_authorization
-      download_repositories = %w(rpm_enterprise__local debian_enterprise__local)
+      download_repositories = %w[rpm_enterprise__local debian_enterprise__local]
       manifest.each do |dist, packages|
+        if packages.nil?
+          warn "Package list for #{dist} is empty, skipping"
+          next
+        end
         packages.each do |name, info|
           package_file_name = info['filename']
           puts format(
-                 "Searching Artifactory [%s]%s for %s (md5: %s)",
+            "Searching Artifactory [%s]%s for %s (md5: %s)",
                  download_repositories.join(', '),
                  remote_path.empty? ? '' : "/#{remote_path}",
                  package_file_name,
                  info['md5']
-               )
+          )
           artifacts = Artifactory::Resource::Artifact.checksum_search(
             md5: info['md5'],
             repos: download_repositories,
@@ -418,14 +421,15 @@ module Pkg
       check_authorization
       ship_paths.each do |path|
         Dir.foreach(local_tarball_directory) do |pe_tarball|
-          next if pe_tarball == '.' || pe_tarball == ".."
+          next if ['.', '..'].include?(pe_tarball)
           begin
             puts "Uploading #{pe_tarball} to #{target_repo}/#{path}#{pe_tarball}"
             artifact = Artifactory::Resource::Artifact.new(
-              local_path: "#{local_tarball_directory}/#{pe_tarball}")
+              local_path: "#{local_tarball_directory}/#{pe_tarball}"
+            )
             artifact.upload(target_repo, "#{path}#{pe_tarball}")
           rescue Errno::EPIPE
-            STDERR.puts "Warning: Could not upload #{pe_tarball} to #{target_repo}/#{path}. Skipping."
+            warn "Warning: Could not upload #{pe_tarball} to #{target_repo}/#{path}. Skipping."
             next
           end
         end
@@ -449,7 +453,7 @@ module Pkg
       begin
         puts "Uploading #{local_path} to #{target_repo}/#{full_upload_path} . . ."
         artifact.upload(target_repo, full_upload_path, properties, headers)
-      rescue Artifactory::Error::HTTPError => e
+      rescue Artifactory::Error::HTTPError
         fail "Error: Upload failed. Ensure path #{target_path} exists in the #{target_repo} repository."
       end
     end
@@ -584,7 +588,7 @@ module Pkg
       begin
         artifact.copy(artifactory_target_path)
       rescue Artifactory::Error::HTTPError
-        STDERR.puts "Could not copy #{artifactory_target_path}. Source and destination are the same. Skipping..."
+        warn "Could not copy #{artifactory_target_path}. Source and destination are the same. Skipping..."
       end
 
       if File.extname(filename) == '.deb'
@@ -606,9 +610,9 @@ module Pkg
         puts "Copying #{dist} packages..."
         packages.each do |name, info|
           filename = info["filename"]
-          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
+          artifact = Artifactory::Resource::Artifact.checksum_search(md5: (info['md5']).to_s, repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
           if artifact.nil?
-            raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
+            raise "Error: what the hell, could not find package #{filename} with md5sum #{info['md5']}"
           end
           copy_artifact(artifact, artifact.repo, "#{target_path}/#{dist}/#{filename}")
         end
@@ -640,7 +644,7 @@ module Pkg
         packages.each do |package_name, info|
           next unless package_name == package
           filename = info["filename"]
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: repos, name: filename)
+          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: (info['md5']).to_s, repos: repos, name: filename)
           artifacts.each do |artifact|
             next unless artifact.download_uri.include? remote_path
             puts "Removing reverted package #{artifact.download_uri}"
@@ -658,7 +662,7 @@ module Pkg
     def purge_copied_pe_tarballs(tarball_path, pe_repo)
       check_authorization
       Dir.foreach("#{tarball_path}/") do |pe_tarball|
-        next if pe_tarball == '.' || pe_tarball == ".."
+        next if ['.', '..'].include?(pe_tarball)
         md5 = Digest::MD5.file("#{tarball_path}/#{pe_tarball}").hexdigest
         artifacts_to_delete = Artifactory::Resource::Artifact.checksum_search(md5: md5, repos: pe_repo, name: pe_tarball)
         next if artifacts_to_delete.nil?
@@ -668,7 +672,7 @@ module Pkg
             artifact.delete
           end
         rescue Artifactory::Error::HTTPError
-          STDERR.puts "Error: cannot remove #{pe_tarball}, do you have the right permissions?"
+          warn "Error: cannot remove #{pe_tarball}, do you have the right permissions?"
         end
       end
     end

data/lib/packaging/config/params.rb

@@ -3,194 +3,193 @@ require "packaging/platforms"
 # These are all of the parameters known to our packaging system.
 # They are ingested by the config class as class instance variables
 module Pkg::Params
-  BUILD_PARAMS = [:allow_dirty_tree,
-                  :answer_override,
-                  :apt_archive_path,
-                  :apt_archive_repo_command,
-                  :apt_host,
-                  :apt_releases,
-                  :apt_repo_command,
-                  :apt_repo_name,
-                  :apt_repo_path,
-                  :apt_repo_staging_path,
-                  :apt_repo_url,
-                  :apt_signing_server,
-                  :apt_staging_server,
-                  :author,
-                  :benchmark,
-                  :build_data_repo,
-                  :build_date,
-                  :build_defaults,
-                  :build_dmg,
-                  :build_doc,
-                  :build_gem,
-                  :build_ips,
-                  :build_msi,
-                  :build_pe,
-                  :build_tar,
-                  :builder_data_file,
-                  :builds_server,
-                  :bundle_platforms,
-                  :certificate_pem,
-                  :cows,
-                  :db_table,
-                  :deb_build_host,
-                  :deb_build_mirrors,
-                  :deb_targets,
-                  :debug,
-                  :debversion,
-                  :default_cow,
-                  :default_mock,
-                  :dev_build,
-                  :description,
-                  :distribution_server,
-                  :dmg_host,
-                  :dmg_path,
-                  :dmg_staging_server,
-                  :downloads_archive_path,
-                  :email,
-                  :files,
-                  :final_mocks,
-                  :foss_only,
-                  :foss_platforms,
-                  :freight_archive_path,
-                  :freight_conf,
-                  :gem_default_executables,
-                  :gem_dependencies,
-                  :gem_description,
-                  :gem_devel_dependencies,
-                  :gem_development_dependencies,
-                  :gem_excludes,
-                  :gem_executables,
-                  :gem_files,
-                  :gem_forge_project,
-                  :gem_host,
-                  :gem_license,
-                  :gem_name,
-                  :gem_path,
-                  :gem_platform_dependencies,
-                  :gem_rdoc_options,
-                  :gem_require_path,
-                  :gem_required_ruby_version,
-                  :gem_required_rubygems_version,
-                  :gem_runtime_dependencies,
-                  :gem_summary,
-                  :gem_test_files,
-                  :gemversion,
-                  :gpg_key,
-                  :gpg_name,
-                  :homepage,
-                  :internal_gem_host,
-                  :ips_build_host,
-                  :ips_host,
-                  :ips_inter_cert,
-                  :ips_package_host,
-                  :ips_path,
-                  :ips_repo,
-                  :ips_root_cert,
-                  :ips_signing_cert,
-                  :ips_signing_key,
-                  :ips_signing_server,
-                  :ips_signing_ssh_key,
-                  :ips_store,
-                  :jenkins_build_host,
-                  :jenkins_packaging_job,
-                  :jenkins_repo_path,
-                  :metrics,
-                  :metrics_url,
-                  :msi_host,
-                  :msi_name,
-                  :msi_path,
-                  :msi_signing_cert,
-                  :msi_signing_cert_pw,
-                  :msi_signing_server,
-                  :msi_signing_ssh_key,
-                  :msi_staging_server,
-                  :name,
-                  :nonfinal_apt_repo_command,
-                  :nonfinal_apt_repo_path,
-                  :nonfinal_apt_repo_staging_path,
-                  :nonfinal_dmg_path,
-                  :nonfinal_gem_path,
-                  :nonfinal_ips_path,
-                  :nonfinal_msi_path,
-                  :nonfinal_p5p_path,
-                  :nonfinal_repo_name,
-                  :nonfinal_repo_link_target,
-                  :nonfinal_svr4_path,
-                  :nonfinal_swix_path,
-                  :nonfinal_yum_repo_path,
-                  :notify,
-                  :nuget_host,
-                  :nuget_repo_path,
-                  :origversion,
-                  :osx_build_host,
-                  :osx_signing_cert,
-                  :osx_signing_keychain,
-                  :osx_signing_keychain_pw,
-                  :osx_signing_server,
-                  :osx_signing_ssh_key,
-                  :p5p_host,
-                  :p5p_path,
-                  :packager,
-                  :packaging_repo,
-                  :packaging_root,
-                  :packaging_url,
-                  :pbuild_conf,
-                  :pe_feature_branch,
-                  :pe_release_branch,
-                  :pe_name,
-                  :pe_platforms,
-                  :pe_version,
-                  :pg_major_version,
-                  :platform_repos,
-                  :pre_tar_task,
-                  :pre_tasks,
-                  :privatekey_pem,
-                  :project,
-                  :project_root,
-                  :random_mockroot,
-                  :rc_mocks,
-                  :redis_hostname,
-                  :ref,
-                  :release,
-                  :repo_link_target,
-                  :repo_name,
-                  :rpm_build_host,
-                  :rpm_targets,
-                  :rpmrelease,
-                  :rpmversion,
-                  :rsync_servers,
-                  :s3_ship,
-                  :short_ref,
-                  :sign_tar,
-                  :signing_server,
-                  :staging_server,
-                  :summary,
-                  :svr4_host,
-                  :svr4_path,
-                  :swix_host,
-                  :swix_path,
-                  :swix_staging_server,
-                  :tar_excludes,
-                  :tar_host,
-                  :tar_staging_server,
-                  :tarball_path,
-                  :task,
-                  :team,
-                  :templates,
-                  :update_version_file,
-                  :vanagon_project,
-                  :version,
-                  :version_file,
-                  :version_strategy,
-                  :yum_archive_path,
-                  :yum_host,
-                  :yum_repo_command,
-                  :yum_repo_name,
-                  :yum_repo_path,
-                  :yum_staging_server,
-                 ]
+  BUILD_PARAMS = %i[allow_dirty_tree
+                  answer_override
+                  apt_archive_path
+                  apt_archive_repo_command
+                  apt_host
+                  apt_releases
+                  apt_repo_command
+                  apt_repo_name
+                  apt_repo_path
+                  apt_repo_staging_path
+                  apt_repo_url
+                  apt_signing_server
+                  apt_staging_server
+                  author
+                  benchmark
+                  build_data_repo
+                  build_date
+                  build_defaults
+                  build_dmg
+                  build_doc
+                  build_gem
+                  build_ips
+                  build_msi
+                  build_pe
+                  build_tar
+                  builder_data_file
+                  builds_server
+                  bundle_platforms
+                  certificate_pem
+                  cows
+                  db_table
+                  deb_build_host
+                  deb_build_mirrors
+                  deb_targets
+                  debug
+                  debversion
+                  default_cow
+                  default_mock
+                  dev_build
+                  description
+                  distribution_server
+                  dmg_host
+                  dmg_path
+                  dmg_staging_server
+                  downloads_archive_path
+                  email
+                  files
+                  final_mocks
+                  foss_only
+                  foss_platforms
+                  freight_archive_path
+                  freight_conf
+                  gem_default_executables
+                  gem_dependencies
+                  gem_description
+                  gem_devel_dependencies
+                  gem_development_dependencies
+                  gem_excludes
+                  gem_executables
+                  gem_files
+                  gem_forge_project
+                  gem_host
+                  gem_license
+                  gem_name
+                  gem_path
+                  gem_platform_dependencies
+                  gem_rdoc_options
+                  gem_require_path
+                  gem_required_ruby_version
+                  gem_required_rubygems_version
+                  gem_runtime_dependencies
+                  gem_summary
+                  gem_test_files
+                  gemversion
+                  gpg_key
+                  gpg_name
+                  homepage
+                  internal_gem_host
+                  ips_build_host
+                  ips_host
+                  ips_inter_cert
+                  ips_package_host
+                  ips_path
+                  ips_repo
+                  ips_root_cert
+                  ips_signing_cert
+                  ips_signing_key
+                  ips_signing_server
+                  ips_signing_ssh_key
+                  ips_store
+                  jenkins_build_host
+                  jenkins_packaging_job
+                  jenkins_repo_path
+                  metrics
+                  metrics_url
+                  msi_host
+                  msi_name
+                  msi_path
+                  msi_signing_cert
+                  msi_signing_cert_pw
+                  msi_signing_server
+                  msi_signing_ssh_key
+                  msi_staging_server
+                  name
+                  nonfinal_apt_repo_command
+                  nonfinal_apt_repo_path
+                  nonfinal_apt_repo_staging_path
+                  nonfinal_dmg_path
+                  nonfinal_gem_path
+                  nonfinal_ips_path
+                  nonfinal_msi_path
+                  nonfinal_p5p_path
+                  nonfinal_repo_name
+                  nonfinal_repo_link_target
+                  nonfinal_svr4_path
+                  nonfinal_swix_path
+                  nonfinal_yum_repo_path
+                  notify
+                  nuget_host
+                  nuget_repo_path
+                  origversion
+                  osx_build_host
+                  osx_signing_cert
+                  osx_signing_keychain
+                  osx_signing_keychain_pw
+                  osx_signing_server
+                  osx_signing_ssh_key
+                  p5p_host
+                  p5p_path
+                  packager
+                  packaging_repo
+                  packaging_root
+                  packaging_url
+                  pbuild_conf
+                  pe_feature_branch
+                  pe_release_branch
+                  pe_name
+                  pe_platforms
+                  pe_version
+                  pg_major_version
+                  platform_repos
+                  pre_tar_task
+                  pre_tasks
+                  privatekey_pem
+                  project
+                  project_root
+                  random_mockroot
+                  rc_mocks
+                  redis_hostname
+                  ref
+                  release
+                  repo_link_target
+                  repo_name
+                  rpm_build_host
+                  rpm_targets
+                  rpmrelease
+                  rpmversion
+                  rsync_servers
+                  s3_ship
+                  short_ref
+                  sign_tar
+                  signing_server
+                  staging_server
+                  summary
+                  svr4_host
+                  svr4_path
+                  swix_host
+                  swix_path
+                  swix_staging_server
+                  tar_excludes
+                  tar_host
+                  tar_staging_server
+                  tarball_path
+                  task
+                  team
+                  templates
+                  update_version_file
+                  vanagon_project
+                  version
+                  version_file
+                  version_strategy
+                  yum_archive_path
+                  yum_host
+                  yum_repo_command
+                  yum_repo_name
+                  yum_repo_path
+                  yum_staging_server]
 
   # Environment variable overrides for Pkg::Config parameters
   #
@@ -204,7 +203,7 @@ module Pkg::Params
               { :var => :apt_archive_path,        :envvar => :APT_ARCHIVE_PATH },
               { :var => :apt_archive_repo_command, :envvar => :APT_ARCHIVE_REPO_COMMAND },
               { :var => :apt_host,                :envvar => :APT_HOST },
-              { :var => :apt_releases,            :envvar => :APT_RELEASES,    :type => :array },
+              { :var => :apt_releases,            :envvar => :APT_RELEASES, :type => :array },
               { :var => :apt_repo_path,           :envvar => :APT_REPO },
               { :var => :apt_repo_staging_path,   :envvar => :APT_REPO_STAGING_PATH },
               { :var => :apt_signing_server,      :envvar => :APT_SIGNING_SERVER },
@@ -219,10 +218,10 @@ module Pkg::Params
               { :var => :build_tar,               :envvar => :TAR,             :type => :bool },
               { :var => :certificate_pem,         :envvar => :CERT_PEM },
               { :var => :cows,                    :envvar => :COW },
-              { :var => :debug,                   :envvar => :DEBUG,           :type => :bool },
+              { :var => :debug,                   :envvar => :DEBUG, :type => :bool },
               { :var => :default_cow,             :envvar => :COW },
               { :var => :default_mock,            :envvar => :MOCK },
-              { :var => :dev_build,               :envvar => :DEV_BUILD,       :type => :bool },
+              { :var => :dev_build,               :envvar => :DEV_BUILD, :type => :bool },
               { :var => :dmg_host,                :envvar => :DMG_HOST },
               { :var => :dmg_path,                :envvar => :DMG_PATH },
               { :var => :dmg_staging_server,      :envvar => :DMG_STAGING_SERVER },
@@ -251,7 +250,7 @@ module Pkg::Params
               { :var => :msi_signing_ssh_key,     :envvar => :MSI_SIGNING_SSH_KEY },
               { :var => :msi_staging_server,      :envvar => :MSI_STAGING_SERVER },
               { :var => :nonfinal_apt_repo_command, :envvar => :NONFINAL_APT_REPO_COMMAND },
-              { :var => :nonfinal_apt_repo_path,  :envvar => :NONFINAL_APT_REPO_PATH },
+              { :var => :nonfinal_apt_repo_path, :envvar => :NONFINAL_APT_REPO_PATH },
               { :var => :nonfinal_apt_repo_staging_path, :envvar => :NONFINAL_APT_REPO_STAGING_PATH },
               { :var => :nonfinal_dmg_path,       :envvar => :NONFINAL_DMG_PATH },
               { :var => :nonfinal_gem_path,       :envvar => :NONFINAL_GEM_PATH },
@@ -384,5 +383,4 @@ module Pkg::Params
   VALIDATIONS = [
     { :var => :project, :validations => [:not_empty?] }
   ]
-
 end