packaging 0.99.44 → 0.99.45

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: eca6e407742bbed3de2086ad1c9082321389318c0312e67770fcdf70820b3683
4
- data.tar.gz: 4d9d044f07de8e5d41f90da03965985a23c28f525d44b8748e75cf259211e6cc
3
+ metadata.gz: 4ac7070ff94ebd455cb676a068b288cf6a66bd67cb9b9fae886b939cd122f33e
4
+ data.tar.gz: 2f54c6d07e0c1dfa1a1a8e08e95d818727da0d2e3857f7673e3fa16f1aac7d3b
5
5
  SHA512:
6
- metadata.gz: dfc77925aa9fa475d0ea15833e5f29c75a2f70b297df50b03966074d59164d858a482a86cf15a8e1acfe7386185ef19836e1650a8861cb9cb81e476042d0689a
7
- data.tar.gz: 4788649e8c65699af3916dae47e0402e5ee6b8836aa9892f0be1f08c561997ec8a1588cfd8a23b8d08ac270cd8af7f63528845e88b2b8d1b8ba40a46a1bb18ca
6
+ metadata.gz: 0ad7a909bf0daaa570ca54266efe75aff45e0b3f48b8a0553c26048d5f694c2db92f5e5571a8bc4ee142f1776d55b7ee3f7816fbd63ac4ec5d3eed4ac08c29f6
7
+ data.tar.gz: 515edd1fc993713e6c465ce085f97470208d070ca0bb16dd3e2ebc7f61b319b9edd60a8263a4ed5087574b6bfeb81e3dbb75a553a6860804370607ca2be20144
@@ -580,6 +580,13 @@ module Pkg
580
580
  rescue Artifactory::Error::HTTPError
581
581
  STDERR.puts "Could not copy #{artifact_target_path}. Source and destination are the same. Skipping..."
582
582
  end
583
+ if File.extname(info["filename"]) == '.deb'
584
+ copied_artifact_search = Artifactory::Resource::Artifact.pattern_search(repo: 'debian_enterprise__local', pattern: "#{target_path}/*/#{info["filename"]}")
585
+ fail "Error: what the hell, could not find just-copied package #{info["filename"]} under debian_enterprise__local/#{target_path}" if copied_artifact_search.nil?
586
+ copied_artifact = copied_artifact_search.first
587
+ properties = { 'deb.component' => Pkg::Paths.two_digit_pe_version_from_path(target_path) }
588
+ copied_artifact.properties(properties)
589
+ end
583
590
  end
584
591
  end
585
592
  end
@@ -302,4 +302,10 @@ module Pkg::Paths
302
302
  return nil
303
303
  end
304
304
  end
305
+
306
+ def two_digit_pe_version_from_path(path)
307
+ matches = path.match(/\d+\.\d+/)
308
+ fail "Error: Could not determine PE version from path #{path}" if matches.nil?
309
+ return matches[0]
310
+ end
305
311
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: packaging
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.99.44
4
+ version: 0.99.45
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-10-03 00:00:00.000000000 Z
11
+ date: 2019-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec