[Qa-jenkins-scm] [jenkins.debian.net] 03/05: reproducible: common.py: allow passing a distribution value to the scripts (defaulting to debian for now)

Mattia Rizzolo mattia at debian.org
Mon Dec 11 09:54:06 UTC 2017


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

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

commit 0afdbbda8789ba6040ddff6e49409ea77859cc63
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Nov 22 15:56:44 2017 +0100

    reproducible: common.py: allow passing a distribution value to the scripts (defaulting to debian for now)
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible_common.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 722c266..9933be6 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -48,6 +48,8 @@ CONFIG = os.path.join(__location__, 'reproducible.ini')
 ## command line option parsing
 parser = argparse.ArgumentParser()
 group = parser.add_mutually_exclusive_group()
+parser.add_argument('distro', help='name of the distribution to work on',
+                    default='debian', nargs='?')
 group.add_argument("-d", "--debug", action="store_true")
 group.add_argument("-q", "--quiet", action="store_true")
 parser.add_argument("--skip-database-connection", action="store_true",
@@ -55,6 +57,7 @@ parser.add_argument("--skip-database-connection", action="store_true",
 parser.add_argument("--ignore-missing-files", action="store_true",
                     help="useful for local testing, where you don't have all the build logs, etc..")
 args, unknown_args = parser.parse_known_args()
+DISTRO = args.distro
 log_level = logging.INFO
 if args.debug or DEBUG:
     DEBUG = True
@@ -74,7 +77,11 @@ log.info('Starting at %s', started_at)
 ## load configuration
 config = configparser.ConfigParser()
 config.read(CONFIG)
-conf_distro = config['debian']
+try:
+    conf_distro = config[DISTRO]
+except KeyError:
+    log.critical('Distribution %s is not known.', DISTRO)
+    sys.exit(1)
 
 # tested suites
 SUITES = conf_distro['suites'].split()

-- 
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