[sagemath] 01/01: Abort build when pruner does not find a package (or distribution is unstable-sage).

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sagemath.

commit 956d29899d07e6a4bbc9f1919826251321c8203c
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sun Dec 4 17:32:23 2016 +0000

    Abort build when pruner does not find a package (or distribution is unstable-sage).
---
 debian/pruner/pruner.py.in | 4 ++++
 debian/rules               | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 1ef4a41..cfe6007 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -4,10 +4,12 @@
 import os
 import codecs
 import subprocess
+import sys
 import time
 import imp
 
 system_installed_packages = 0
+system_packages_not_found = 0
 installed_dir = '@SAGE_ROOT@/local/var/lib/sage/installed'
 now = int(time.time())
 
@@ -244,6 +246,8 @@ for key, val in sorted(dico.items()):
     if val:
         declare_system(key)
     else:
+        system_packages_not_found += 1
         print ('{0:s} will not come from debian!'.format (key))
 
 print('{0:d} system packages will be used'.format(system_installed_packages))
+sys.exit(system_packages_not_found)
diff --git a/debian/rules b/debian/rules
index 86d23d4..b74ef1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,7 +142,7 @@ get-orig-source:
 prune: debian/control
 	cd debian/pruner && autoconf -I m4
 	cd debian/pruner && ./configure --with-sage-root="$(shell pwd)/sage"
-	cd sage && python ../debian/pruner/pruner.py
+	cd sage && python ../debian/pruner/pruner.py ||	test $$(dpkg-parsechangelog -l../debian/changelog -SDistribution) = unstable-sage
 	touch prune
 
 ptestlong:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git