packaging 0.99.44 → 0.99.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/packaging/artifactory.rb +7 -0
- data/lib/packaging/paths.rb +6 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4ac7070ff94ebd455cb676a068b288cf6a66bd67cb9b9fae886b939cd122f33e
|
|
4
|
+
data.tar.gz: 2f54c6d07e0c1dfa1a1a8e08e95d818727da0d2e3857f7673e3fa16f1aac7d3b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
data/lib/packaging/paths.rb
CHANGED
|
@@ -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.
|
|
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-
|
|
11
|
+
date: 2019-10-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|