[SCM] ci-tooling packaging branch, master, updated. cfe1d23fbdeb8f2417cb3955409a12c4203ece2e
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Fri Jul 17 16:12:16 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=cfe1d23
The following commit has been merged in the master branch:
commit cfe1d23fbdeb8f2417cb3955409a12c4203ece2e
Author: Rohan Garg <rohan at garg.io>
Date: Fri Jul 17 18:12:02 2015 +0200
Fallback to regular xz when pxz isn't found
---
lib/ci/build_source.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index 424e1e2..55ca190 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -50,7 +50,11 @@ class VcsSourceBuilder
Dir.chdir(BUILD_DIR) do
tar = "#{@source.name}_#{@tar_version}.orig.tar"
fail 'Failed to create a tarball' unless system("tar -cf #{tar} source")
- fail 'Failed to compress the tarball' unless system("pxz -6 #{tar}")
+ r = system("pxz -6 #{tar}")
+ unless r
+ warn 'Falling back to slower single threaded compression'
+ fail 'Failed to compress the tarball' unless system("xz -6 #{tar}")
+ end
end
end
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list