[Qa-jenkins-scm] [jenkins.debian.net] 06/07: reproducible Debian: no need to wrap the bits that won't fail in the try-except.

Holger Levsen holger at layer-acht.org
Mon Nov 7 17:13:31 UTC 2016


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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 00b64a9e83c86623fc8026bf7a21c81b3c0bd8ac
Author: Chris Lamb <lamby at debian.org>
Date:   Mon Nov 7 13:27:59 2016 +0000

    reproducible Debian: no need to wrap the bits that won't fail in the try-except.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_create_meta_pkg_sets.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 38b27fb..c953049 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -34,15 +34,16 @@ import yaml
 try:
 	with open(sys.argv[1]) as fd:
 		manifest = yaml.load(fd)
-		seen = set()
-		for pkg in (manifest['packages']['binary'] + manifest['packages']['source']):
-			pkgname = pkg['package']
-			if pkgname not in seen:
-				print(pkgname, end='|')
-				seen.add(pkgname)
 except Exception as exc:
 	print("Warning: something went wrong while parsing the build manifest as YAML file: {}".format(exc))
-
+	sys.exit(0)
+
+seen = set()
+for pkg in (manifest['packages']['binary'] + manifest['packages']['source']):
+	pkgname = pkg['package']
+	if pkgname not in seen:
+		print(pkgname, end='|')
+		seen.add(pkgname)
 EOF
 )
 	grep-dctrl -F Package -e '^('"$ALL_PKGS"')$' $packages > "$tmpfile"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list