ood_packaging 0.13.2 → 0.13.4
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/ood_packaging/build.rb +10 -1
- data/lib/ood_packaging/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ef3158c7af4a1056980e0a33b52459b29d576a7ac7b19d6151006a10196ad0a1
|
|
4
|
+
data.tar.gz: 27c85e589353a513ad3b34843dc60f41df24253e9625fdeda3e4740247d556e2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0e3a145a98083b6c27f93e4665b7660d7302ac791967424fac4dbfeb8ec1cf951c0ff899f72f0a90bb2d966bbf3029800a23a025fd5048af6c35b2abf2de29e2
|
|
7
|
+
data.tar.gz: 894745bc1a781d6eb31fb1e714af373bcce391e9d7af897059ad05e02a1d284a62d80faf6d261366abc23b272076514721ebe8a2e102eb5fd5fc8968a98ade57
|
data/lib/ood_packaging/build.rb
CHANGED
|
@@ -273,9 +273,17 @@ class OodPackaging::Build
|
|
|
273
273
|
sh "#{cmd.join(' ')}#{cmd_suffix}"
|
|
274
274
|
end
|
|
275
275
|
|
|
276
|
+
# rubocop:disable Metrics/MethodLength
|
|
276
277
|
def install_deb_dependencies!
|
|
277
278
|
sh "sudo apt update -y#{cmd_suffix}"
|
|
278
279
|
extra_depends = config.fetch(:extra_depends, nil)
|
|
280
|
+
if extra_depends.nil?
|
|
281
|
+
extra_depends = ''
|
|
282
|
+
else
|
|
283
|
+
extra_depends = extra_depends.split(',').map(&:strip) if extra_depends.is_a?(String)
|
|
284
|
+
extra_depends.unshift('')
|
|
285
|
+
extra_depends = extra_depends.join(', ')
|
|
286
|
+
end
|
|
279
287
|
tool = [
|
|
280
288
|
'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
|
|
281
289
|
'-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
|
|
@@ -290,11 +298,12 @@ class OodPackaging::Build
|
|
|
290
298
|
"#{package}-build-deps*.changes"
|
|
291
299
|
]
|
|
292
300
|
Dir.chdir(deb_work_dir) do
|
|
293
|
-
sh "sed -i 's|@EXTRA_DEPENDS@|#{extra_depends}|g' debian/control#{cmd_suffix}"
|
|
301
|
+
sh "sed -i 's|@EXTRA_DEPENDS@|#{extra_depends}|g' debian/control#{cmd_suffix}"
|
|
294
302
|
sh "#{cmd.join(' ')}#{cmd_suffix}"
|
|
295
303
|
sh "rm -f #{cleanup.join(' ')}#{cmd_suffix}"
|
|
296
304
|
end
|
|
297
305
|
end
|
|
306
|
+
# rubocop:enable Metrics/MethodLength
|
|
298
307
|
|
|
299
308
|
def rpmbuild!
|
|
300
309
|
puts "== RPM build spec=#{spec_file} ==".blue
|