Merge lp:~laney/ubuntu-archive-scripts/generate-team-p-m-xz-me-harder into lp:ubuntu-archive-scripts

Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 283
Merged at revision: 285
Proposed branch: lp:~laney/ubuntu-archive-scripts/generate-team-p-m-xz-me-harder
Merge into: lp:ubuntu-archive-scripts
Diff against target: 28 lines (+5/-2)
2 files modified
generate-team-p-m (+4/-1)
run-proposed-migration (+1/-1)
To merge this branch: bzr merge lp:~laney/ubuntu-archive-scripts/generate-team-p-m-xz-me-harder
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+387371@code.launchpad.net

Description of the change

I've cowboyed this on snakefruit, will uncowboy once merged!

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for fixing that one!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'generate-team-p-m'
--- generate-team-p-m 2020-07-01 08:19:40 +0000
+++ generate-team-p-m 2020-07-14 14:22:54 +0000
@@ -240,7 +240,10 @@
240240
241 print("fetching yaml")241 print("fetching yaml")
242 if args.excuses_yaml:242 if args.excuses_yaml:
243 yaml_text = open(args.excuses_yaml)243 if args.excuses_yaml.endswith('.xz'):
244 yaml_text = lzma.open(args.excuses_yaml)
245 else:
246 yaml_text = open(args.excuses_yaml)
244 else:247 else:
245 try:248 try:
246 yaml_text = lzma.open(urlopen("https://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.yaml.xz"))249 yaml_text = lzma.open(urlopen("https://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.yaml.xz"))
247250
=== modified file 'run-proposed-migration'
--- run-proposed-migration 2020-04-24 13:12:18 +0000
+++ run-proposed-migration 2020-07-14 14:22:54 +0000
@@ -54,7 +54,7 @@
54code/b1/britney $actions >"$logfile" 2>&154code/b1/britney $actions >"$logfile" 2>&1
55if [ "$SERIES" = "$DEFAULT_SERIES" ]; then55if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
56 cd ~/public_html/proposed-migration/56 cd ~/public_html/proposed-migration/
57 generate-team-p-m --excuses-yaml $SERIES/update_excuses.yaml \57 generate-team-p-m --excuses-yaml $SERIES/update_excuses.yaml.xz \
58 --subscribers-json ~/public_html/package-team-mapping.json \58 --subscribers-json ~/public_html/package-team-mapping.json \
59 $SERIES/update_excuses_by_team.html $SERIES/update_excuses_by_team.yaml59 $SERIES/update_excuses_by_team.html $SERIES/update_excuses_by_team.yaml
60 tmpdir="$(mktemp -d)"60 tmpdir="$(mktemp -d)"

Subscribers

People subscribed via source and target branches