diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-11-10 00:41:06 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-11-10 00:41:06 +0100 |
| commit | 80f9a49db71525fbf7a44b7f4b1c71f71583bf7a (patch) | |
| tree | 76b95536f2033bbb5939225a1e6a8d5806af356f /bin | |
| parent | f359c966c3bf56d9ded35b565e35b0c9f4be8246 (diff) | |
| download | jenkins.debian.net-80f9a49db71525fbf7a44b7f4b1c71f71583bf7a.tar.xz | |
reproducible Debian: fixup f359c966, also refactor _common.py accordingly to .csv file change
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reproducible_common.py | 6 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 04552d13..b23cb0e6 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -88,11 +88,13 @@ JENKINS_URL = 'https://jenkins.debian.net' # global package set definitions # META_PKGSET[pkgset_id] = (pkgset_name, pkgset_group) -# csv file columns: (pkgset_id, pkgset_group, pkgset_name) +# csv file columns: (pkgset_group, pkgset_name) META_PKGSET = {} +pkgset_id = 0 with open(os.path.join(BIN_PATH, './reproducible_pkgsets.csv'), newline='') as f: for line in csv.reader(f): - META_PKGSET[int(line[0])] = (line[2], line[1]) + pkgset_id += 1 + META_PKGSET[pkgset_id] = (line[1], line[0]) # init the database data and connection DB_ENGINE = create_engine("sqlite:///" + REPRODUCIBLE_DB, connect_args={'timeout': 60}) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index cb01bfe0..ea883546 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -110,12 +110,12 @@ TABLE[8]=stats_bugs_sin_ftbfs TABLE[9]=stats_bugs_sin_ftbfs_state # package sets defined in meta_pkgsets.csv -# csv file columns: (pkgset_id, pkgset_group, pkgset_name) +# csv file columns: (pkgset_group, pkgset_name) colindex=0 -while IFS=, read col1 col2 col3 +while IFS=, read col1 col2 do let colindex+=1 - META_PKGSET[$colindex]=$col3 + META_PKGSET[$colindex]=$col2 done < $BIN_PATH/reproducible_pkgsets.csv # mustache templates |