[SCM] ci-tooling packaging branch, master, updated. c9ca79f8c2c8de5d3119f8e20d3fa7be9ee22499

Rohan Garg rohangarg-guest at moszumanska.debian.org
Tue Nov 3 16:51:25 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=c9ca79f

The following commit has been merged in the master branch:
commit c9ca79f8c2c8de5d3119f8e20d3fa7be9ee22499
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Nov 3 17:50:46 2015 +0100

    Allow building source without all deps installed, and only warn
    when building old package
---
 dci/mozilla.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 362958d..981d3d3 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -200,8 +200,7 @@ RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? UBUNTU_RELEASES[-2] : ARGV[2]
 
 release_info = package_releases
 if release_info[:ubuntu] < release_info[:upstream]
-  $logger.error("Can't build new #{PACKAGE}, Ubuntu hasn't updated the package!")
-  exit 0
+  $logger.warn("Building #{PACKAGE} while Ubuntu hasn't updated the package!")
 end
 
 `rm -rf build`
@@ -216,7 +215,7 @@ Dir.chdir('build') do
   Dir.chdir(src_dir) do
     `dch --release --distribution #{ARGV[2]} ""`
     # Needs full source upload because version 1000 doesn't exist in Ubuntu
-    dci_run_cmd('dpkg-buildpackage -S -sa -uc -us')
+    dci_run_cmd('dpkg-buildpackage -S -sa -uc -us -d')
   end
   system("dcmd cp #{PACKAGE}*.changes /build/")
 end

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list