Merge ~brian-murray/ubuntu-archive-tools:pup-is-None into ubuntu-archive-tools:main

Proposed by Brian Murray
Status: Merged
Merged at revision: 9cea5945ce69b75d150197c1e2dc8db75327e2ef
Proposed branch: ~brian-murray/ubuntu-archive-tools:pup-is-None
Merge into: ubuntu-archive-tools:main
Diff against target: 18 lines (+6/-1)
1 file modified
phased-updater (+6/-1)
Reviewer Review Type Date Requested Status
Ɓukasz Zemczak Pending
Ubuntu Package Archive Administrators Pending
Review via email:

Description of the change

The html portion of the phased-updater was failing due to a package not having a Phased-Update-Percentage:

Traceback (most recent call last):
  File "/home/ubuntu-archive/ubuntu-archive-tools/phased-updater", line 798, in <module>
  File "/home/ubuntu-archive/ubuntu-archive-tools/phased-updater", line 669, in main
    if allpb.phased_update_percentage > 0:
TypeError: unorderable types: NoneType() > int()

I don't know how the archive ended up in this state but the change I've made fixes it and I've already cowboy'ed it on snakefruit.

brian@snakefruit:~$ grep "P-U-P" /home/ubuntu-archive/phased-update-overrides/phased-updates.log
2022-06-17 02:47:08,222 - ERROR - libapache2-mod-php7.4 in has no P-U-P
2022-06-17 02:47:08,539 - ERROR - libapache2-mod-php7.4 in has no P-U-P

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

I'm gonna go ahead and merge this given that it has been running fine on snakefruit since mid June.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/phased-updater b/phased-updater
index 27878a5..6b9b016 100755
--- a/phased-updater
+++ b/phased-updater
@@ -666,7 +666,12 @@ def main():
666 exact_match=True, pocket='Updates',666 exact_match=True, pocket='Updates',
667 binary_name=pbs[0].binary_package_name):667 binary_name=pbs[0].binary_package_name):
668 if allpb.distro_arch_series.distroseries == release:668 if allpb.distro_arch_series.distroseries == release:
669 if allpb.phased_update_percentage > 0:669 if allpb.phased_update_percentage is None:
670 logging.error('%s in %s has no P-U-P' %
671 (pbs[0].binary_package_name,
672 release))
673 continue
674 elif allpb.phased_update_percentage > 0:
670 max_pup = allpb.phased_update_percentage675 max_pup = allpb.phased_update_percentage
671 break676 break
672 if pbs[0].creator_link:677 if pbs[0].creator_link:


People subscribed via source and target branches