[SCM] ci-tooling packaging branch, master, updated. ba3a4025840f3fe94df6f86bbd1e2ca65bcc56f5
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Aug 12 20:37:25 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=ba3a402
The following commit has been merged in the master branch:
commit ba3a4025840f3fe94df6f86bbd1e2ca65bcc56f5
Author: Rohan Garg <rohan at garg.io>
Date: Wed Aug 12 22:36:22 2015 +0200
Make source builds use pbuilder's resolver for satisfying build deps
---
dci/source.rb | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/dci/source.rb b/dci/source.rb
index 5649fee..739e673 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -59,7 +59,7 @@ end
# These should never fail
dci_run_cmd('apt-get update && apt-get -y dist-upgrade')
-dci_run_cmd('apt-get -y install devscripts lsb-release locales libdistro-info-perl')
+dci_run_cmd('apt-get -y install devscripts lsb-release locales libdistro-info-perl pbuilder')
Dir.chdir(ARGV[1]) do
@@ -78,21 +78,8 @@ Dir.chdir(ARGV[1]) do
cl = nil
Dir.chdir(PACKAGING_DIR) do
- cl = Changelog.new
- c = DebianControl.new
- c.parse!
- build_depends = []
- c.source.fetch('build-depends', []).each do |dep|
- build_depends << dep.name
- end
-
- c.source.fetch('build-depends-indep', []).each do |dep|
- build_depends << dep.name
- end
-
- system("apt-get -y install #{build_depends.join(' ')}")
- $logger.fatal('Failed to install build deps!') unless $?.success?
- exit 1 unless $?.success?
+ system('/usr/lib/pbuilder/pbuilder-satisfydepends-classic')
+ fail "Can't install build deps!" unless $?.success?
end
source_name = cl.name
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list