[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][deploy] 3 commits: Do not break on missing changed-by entry

Title: GitLab

Joerg Jaspert pushed to branch deploy at Debian FTP Team / dak

Commits:

  • 926d5f69
    by Joerg Jaspert at 2025-08-26T23:37:42+02:00 
    Do not break on missing changed-by entry
  • c7768dce
    by Joerg Jaspert at 2025-08-26T23:43:40+02:00 
    Use None instead of a string for missing uploader
  • 55d61d9b
    by Joerg Jaspert at 2025-08-26T23:45:40+02:00 
    Merge branch 'master' into deploy

* master:
  Use None instead of a string for missing uploader
  Do not break on missing changed-by entry

1 changed file:

Changes:

  • dak/show_deferred.py
    ... ... @@ -106,7 +106,7 @@ def table_row(changesname, delay, changed_by, closes, fingerprint):
    106 106 
         )
    107 107 
         res += (
    108 108 
             '<td valign="top">%s<br><span class="deferredfp">Fingerprint: %s</span></td>'
    109 
    -        % (html.escape(changed_by, quote=False), fingerprint)
    109 
    +        % (html.escape(changed_by or "Unknown", quote=False), fingerprint)
    110 110 
         )
    111 111 
         res += '<td valign="top">%s</td>' % "".join(
    112 112 
             [
    ... ... @@ -204,7 +204,10 @@ def get_upload_data(changesfn):
    204 204 
             remainingtime = 0
    205 205
    206 206 
         uploader = achanges.get("changed-by")
    207 
    -    uploader = re.sub(r"^\s*(\S.*)\s+<.*>", r"\1", uploader)
    207 
    +    try:
    208 
    +        uploader = re.sub(r"^\s*(\S.*)\s+<.*>", r"\1", uploader)
    209 
    +    except TypeError:
    210 
    +        uploader = None
    208 211 
         with open(changesfn, "rb") as f:
    209 212 
             fingerprint = SignedFile(
    210 213 
                 f.read(), keyrings=get_active_keyring_paths(), require_signature=False

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help Notification message regarding https://salsa.debian.org/ftp-team/dak/-/compare/f4d9ede6af34ad97fcfd81d3873d19a0bacc7cd7...55d61d9bdb54185b473cd857578851890879276b at 1756244802

    Reply to: