pm-helper: make use of YesNoQuestion

Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>

.pylintrc

@@ -34,6 +34,7 @@ disable=fixme,locally-disabled,missing-docstring,useless-option-value,
   duplicate-code,
   too-many-instance-attributes,
   too-many-nested-blocks,
+  too-many-positional-arguments,
   too-many-lines,
 
 

backportpackage

@@ -25,6 +25,7 @@ import shutil
 import subprocess
 import sys
 import tempfile
+from typing import Any, NoReturn
 from urllib.parse import quote
 
 try:
@@ -50,7 +51,7 @@ from ubuntutools.question import YesNoQuestion
 Logger = getLogger()
 
 
-def error(msg, *args):
+def error(msg: str, *args: Any) -> NoReturn:
     Logger.error(msg, *args)
     sys.exit(1)
 

debian/.gitignore

@@ -0,0 +1 @@
+files

debian/changelog

@@ -1,3 +1,75 @@
+ubuntu-dev-tools (0.208) unstable; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * ubuntu-build: consider amd64v3 as valid architecture
+
+  [ Sebastien Bacher ]
+  * ubuntu-build: fix non batch mode errors.
+
+  [ Benjamin Drung ]
+  * Format code with black and isort
+  * ubuntutools/pullpkg.py: initialize vcscmd
+  * make pylint and mypy happy
+  * mark non-returning functions with typing.NoReturn
+  * run-linters: add --errors-only mode and run this during package build
+  * Drop Lintian overrides related to .pyc files
+  * Drop obsolete Rules-Requires-Root: no
+  * run mypy during package build
+  * sponsor-patch: stop checking for bzr being present
+  * Modernize SourcePackage._run_lintian()
+  * requestsync: support pocket parameter in get_ubuntu_srcpkg (LP: #2115990)
+
+ -- Benjamin Drung <bdrung@debian.org>  Wed, 03 Dec 2025 16:33:47 +0100
+
+ubuntu-dev-tools (0.207) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Dan Streetman ]
+  * Fix pull-lp-source --upload-queue (LP: #2110061)
+
+  [ Colin Watson ]
+  * Optimize Launchpad collection handling.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 15 Sep 2025 15:58:34 +0100
+
+ubuntu-dev-tools (0.206) unstable; urgency=medium
+
+  [ Dan Bungert ]
+  * mk-sbuild: enable pkgmaintainermangler
+
+  [ Shengjing Zhu ]
+  * import-bug-from-debian: package option is overridden and not used
+
+  [ Fernando Bravo Hernández ]
+  * Parsing arch parameter to getBinaryPackage() (LP: #2081861)
+
+  [ Simon Quigley ]
+  * Read ~/.devscripts in a more robust way, to ideally pick up multi-line
+    variables (Closes: #725418).
+  * mk-sbuild: default to using UTC for schroots (LP: #2097159).
+  * syncpackage: s/syncblacklist/syncblocklist/g
+  * syncpackage: Cache the sync blocklist in-memory, so it's not fetched
+    multiple times when syncing more than one package.
+  * syncpackage: Catch exceptions cleanly, simply skipping to the next
+    package (erring on the side of caution) if there is an error doing the
+    download (LP: #1943286).
+
+ -- Simon Quigley <tsimonq2@debian.org>  Tue, 04 Mar 2025 13:43:15 -0600
+
+ubuntu-dev-tools (0.205) unstable; urgency=medium
+
+  * [syncpackage] When syncing multiple packages, if one of the packages is in
+    the sync blocklist, do not exit, simply continue.
+  * [syncpackage] Do not use exit(1) on an error or exception unless it
+    applies to all packages, instead return None so we can continue to the
+    next package.
+  * [syncpackage] Add support for -y or --yes, noted that it should be used
+    with care.
+  * Update Standards-Version to 4.7.2, no changes needed.
+
+ -- Simon Quigley <tsimonq2@debian.org>  Sat, 01 Mar 2025 11:29:54 -0600
+
 ubuntu-dev-tools (0.204) unstable; urgency=medium
 
   [ Simon Quigley ]

debian/control

@@ -8,16 +8,17 @@ Uploaders:
  Mattia Rizzolo <mattia@debian.org>,
  Simon Quigley <tsimonq2@debian.org>,
 Build-Depends:
- black <!nocheck>,
- dctrl-tools,
  debhelper-compat (= 13),
- devscripts (>= 2.11.0~),
  dh-make,
  dh-python,
+ black <!nocheck>,
+ dctrl-tools,
+ devscripts (>= 2.11.0~),
  distro-info (>= 0.2~),
  flake8,
  isort <!nocheck>,
  lsb-release,
+ mypy <!nocheck>,
  pylint <!nocheck>,
  python3-all,
  python3-apt,
@@ -30,9 +31,9 @@ Build-Depends:
  python3-pytest,
  python3-requests <!nocheck>,
  python3-setuptools,
+ python3-typeshed <!nocheck>,
  python3-yaml <!nocheck>,
-Standards-Version: 4.7.1
-Rules-Requires-Root: no
+Standards-Version: 4.7.2
 Vcs-Git: https://git.launchpad.net/ubuntu-dev-tools
 Vcs-Browser: https://git.launchpad.net/ubuntu-dev-tools
 Homepage: https://launchpad.net/ubuntu-dev-tools
@@ -40,12 +41,12 @@ Homepage: https://launchpad.net/ubuntu-dev-tools
 Package: ubuntu-dev-tools
 Architecture: all
 Depends:
+ dpkg-dev,
  binutils,
  dctrl-tools,
  devscripts (>= 2.11.0~),
  diffstat,
  distro-info (>= 0.2~),
- dpkg-dev,
  dput,
  lsb-release,
  python3,
@@ -72,10 +73,10 @@ Recommends:
  genisoimage,
  lintian,
  patch,
- sbuild | pbuilder | cowbuilder,
  python3-dns,
  quilt,
  reportbug (>= 3.39ubuntu1),
+ sbuild | pbuilder | cowbuilder,
  ubuntu-keyring | ubuntu-archive-keyring,
 Suggests:
  bzr | brz,

debian/rules

@@ -3,10 +3,11 @@
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f .coverage
-	rm -rf .tox
+	rm -rf .mypy_cache .tox
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	./run-linters --errors-only
 	python3 -m pytest -v ubuntutools
 endif
 

debian/source/lintian-overrides

@@ -1,3 +0,0 @@
-# pyc files are machine-generated; they're expected to have long lines and have unstated copyright
-source: file-without-copyright-information *.pyc [debian/copyright]
-source: very-long-line-length-in-source-file * > 512 [*.pyc:*]

debian/tests/control

@@ -4,4 +4,5 @@ Depends:
  python3-pytest,
  python3-setuptools,
  @,
-Restrictions: allow-stderr
+Restrictions:
+ allow-stderr,

doc/syncpackage.1

@@ -58,7 +58,7 @@ Display more progress information.
 \fB\-F\fR, \fB\-\-fakesync\fR
 Perform a fakesync, to work around a tarball mismatch between Debian and
 Ubuntu.
-This option ignores blacklisting, and performs a local sync.
+This option ignores blocklisting, and performs a local sync.
 It implies \fB\-\-no\-lp\fR, and will leave a signed \fB.changes\fR file
 for you to upload.
 .TP

doc/ubuntu-build.1

@@ -43,7 +43,7 @@ operations.
 \fB\-a\fR ARCHITECTURE, \fB\-\-arch\fR=\fIARCHITECTURE\fR
 Rebuild or rescore a specific architecture. Valid
 architectures are:
-armhf, arm64, amd64, i386, powerpc, ppc64el, riscv64, s390x.
+armhf, arm64, amd64, amd64v3, i386, powerpc, ppc64el, riscv64, s390x.
 .TP
 Batch processing:
 .IP
@@ -66,7 +66,7 @@ Rescore builds to <priority>.
 \fB\-\-arch\fR=\fIARCHITECTURE\fR
 Affect only 'architecture' (can be used several
 times). Valid architectures are:
-arm64, amd64, i386, powerpc, ppc64el, riscv64, s390x.
+armhf, arm64, amd64, amd64v3, i386, powerpc, ppc64el, riscv64, s390x.
 .IP
 \fB\-A=\fIARCHIVE\fR
 Act on the named archive (ppa) instead of on the main Ubuntu archive.

import-bug-from-debian

@@ -150,7 +150,7 @@ def process_bugs(
 
     err = False
     for bug in bugs:
-        ubupackage = package = bug.source
+        ubupackage = bug.source
         if package:
             ubupackage = package
         bug_num = bug.bug_num

lp-bitesize

@@ -23,6 +23,7 @@
 
 import argparse
 import sys
+from typing import Any, NoReturn
 
 from launchpadlib.errors import HTTPError
 from launchpadlib.launchpad import Launchpad
@@ -33,7 +34,7 @@ from ubuntutools.config import UDTConfig
 Logger = getLogger()
 
 
-def error_out(msg, *args):
+def error_out(msg: str, *args: Any) -> NoReturn:
     Logger.error(msg, *args)
     sys.exit(1)
 

merge-changelog

@@ -22,6 +22,7 @@
 # pylint: enable=invalid-name
 
 import sys
+from typing import NoReturn
 
 from debian.changelog import Changelog
 
@@ -30,7 +31,7 @@ from ubuntutools import getLogger
 Logger = getLogger()
 
 
-def usage(exit_code=1):
+def usage(exit_code: int = 1) -> NoReturn:
     Logger.info(
         """Usage: merge-changelog <left changelog> <right changelog>
 

mk-sbuild

@@ -155,6 +155,7 @@ proxy="_unset_"
 DEBOOTSTRAP_NO_CHECK_GPG=0
 EATMYDATA=1
 CCACHE=0
+USE_PKGBINARYMANGLER=0
 
 while :; do
     case "$1" in
@@ -667,6 +668,7 @@ ubuntu)
     if ubuntu_dist_ge "$RELEASE" "edgy"; then
         # Add pkgbinarymangler (edgy and later)
         BUILD_PKGS="$BUILD_PKGS pkgbinarymangler"
+        USE_PKGBINARYMANGLER=1
         # Disable recommends for a smaller chroot (gutsy and later only)
         if ubuntu_dist_ge "$RELEASE" "gutsy"; then
             BUILD_PKGS="--no-install-recommends $BUILD_PKGS"
@@ -926,8 +928,8 @@ if [ -n "$TEMP_PREFERENCES" ]; then
     sudo mv "$TEMP_PREFERENCES" $MNT/etc/apt/preferences.d/proposed.pref
 fi
 
-# Copy the timezone (comment this out if you want to leave the chroot at UTC)
-sudo cp -P --remove-destination /etc/localtime /etc/timezone "$MNT"/etc/
+# Copy the timezone (uncomment this if you want to use your local time zone)
+#sudo cp -P --remove-destination /etc/localtime /etc/timezone "$MNT"/etc/
 # Create a schroot entry for this chroot
 TEMP_SCHROOTCONF=`mktemp -t schrootconf-XXXXXX`
 TEMPLATE_SCHROOTCONF=~/.mk-sbuild.schroot.conf
@@ -1046,6 +1048,25 @@ EOF
 EOM
 fi
 
+if [ "$USE_PKGBINARYMANGLER" = 1 ]; then
+    sudo bash -c "cat >> $MNT/finish.sh" <<EOM
+   mkdir -p /etc/pkgbinarymangler/
+   cat > /etc/pkgbinarymangler/maintainermangler.conf <<EOF
+# pkgmaintainermangler configuration file
+
+# pkgmaintainermangler will do nothing unless enable is set to "true"
+enable: true
+
+# Configure what happens if /CurrentlyBuilding is present, but invalid
+# (i. e. it does not contain a Package: field). If "ignore" (default),
+# the file is ignored (i. e. the Maintainer field is mangled) and a
+# warning is printed. If "fail" (or any other value), pkgmaintainermangler
+# exits with an error, which causes a package build to fail.
+invalid_currentlybuilding: ignore
+EOF
+EOM
+fi
+
 if [ -n "$TARGET_ARCH" ]; then
     sudo bash -c "cat >> $MNT/finish.sh" <<EOM
 # Configure target architecture
@@ -1064,7 +1085,7 @@ apt-get update || true
 echo set debconf/frontend Noninteractive | debconf-communicate
 echo set debconf/priority critical | debconf-communicate
 # Install basic build tool set, trying to match buildd
-apt-get -y --force-yes install $BUILD_PKGS
+apt-get -y --force-yes -o Dpkg::Options::="--force-confold" install $BUILD_PKGS
 # Set up expected /dev entries
 if [ ! -r /dev/stdin ];  then ln -s /proc/self/fd/0 /dev/stdin;  fi
 if [ ! -r /dev/stdout ]; then ln -s /proc/self/fd/1 /dev/stdout; fi

pbuilder-dist

@@ -38,6 +38,7 @@ import shutil
 import subprocess
 import sys
 from contextlib import suppress
+from typing import NoReturn
 
 import debian.deb822
 from distro_info import DebianDistroInfo, DistroDataOutdated, UbuntuDistroInfo
@@ -411,7 +412,7 @@ class PbuilderDist:
         ] + arguments
 
 
-def show_help(exit_code=0):
+def show_help(exit_code: int = 0) -> NoReturn:
     """help() -> None
 
     Print a help message for pbuilder-dist, and exit with the given code.

pm-helper

@@ -22,6 +22,7 @@ from argparse import ArgumentParser
 import yaml
 from launchpadlib.launchpad import Launchpad
 
+from ubuntutools.question import YesNoQuestion
 from ubuntutools.utils import get_url
 
 # proposed-migration is only concerned with the devel series; unlike other
@@ -56,10 +57,8 @@ def claim_excuses_bug(launchpad, bug, package):
     if our_task.assignee:
         print(f"Currently assigned to {our_task.assignee.name}")
 
-    print("""Do you want to claim this bug? [yN] """, end="")
-    sys.stdout.flush()
-    response = sys.stdin.readline()
-    if response.strip().lower().startswith("y"):
+    answer = YesNoQuestion().ask("Do you want to claim this bug?", "no")
+    if answer == "yes":
         our_task.assignee = launchpad.me
         our_task.lp_save()
         return True
@@ -131,6 +130,8 @@ def main():
                 if not proposed_version:
                     print(f"Package {args.package} not found in -proposed.")
                     sys.exit(1)
+                answer = YesNoQuestion().ask("Do you want to create a bug?", "no")
+                if answer == "yes":
                     create_excuses_bug(args.launchpad, args.package, proposed_version)
         except ValueError as e:
             sys.stderr.write(f"{e}\n")

pyproject.toml

@@ -4,3 +4,7 @@ line-length = 99
 [tool.isort]
 line_length = 99
 profile = "black"
+
+[tool.mypy]
+disallow_incomplete_defs = true
+ignore_missing_imports = true

requestsync

@@ -46,7 +46,7 @@ Logger = getLogger()
 #
 
 
-def main():
+def main() -> None:
     # Our usage options.
     usage = "%(prog)s [options] <source package> [<target release> [base version]]"
     parser = argparse.ArgumentParser(usage=usage)
@@ -153,6 +153,7 @@ def main():
             import DNS  # pylint: disable=import-outside-toplevel
 
             DNS.DiscoverNameServers()
+            # imported earlier, pylint: disable-next=possibly-used-before-assignment
             mxlist = DNS.mxlookup(bug_mail_domain)
             firstmx = mxlist[0]
             mailserver_host = firstmx[1]
@@ -214,6 +215,7 @@ def main():
 
     if not args.release:
         if lpapi:
+            # imported earlier, pylint: disable-next=possibly-used-before-assignment
             args.release = Distribution("ubuntu").getDevelopmentSeries().name
         else:
             ubu_info = UbuntuDistroInfo()
@@ -377,6 +379,7 @@ def main():
         # Map status to the values expected by LP API
         mapping = {"new": "New", "confirmed": "Confirmed"}
         # Post sync request using LP API
+        # imported earlier, pylint: disable-next=possibly-used-before-assignment
         post_bug(srcpkg, subscribe, mapping[status], title, report)
     else:
         email_from = ubu_email(export=False)[1]

run-linters

@@ -4,16 +4,45 @@ set -eu
 # Copyright 2023, Canonical Ltd.
 # SPDX-License-Identifier: GPL-3.0
 
-PYTHON_SCRIPTS=$(grep -l -r '^#! */usr/bin/python3$' .)
+PYTHON_SCRIPTS=$(find . -maxdepth 1 -type f -exec grep -l '^#! */usr/bin/python3$' {} +)
 
-echo "Running black..."
-black --check --diff . $PYTHON_SCRIPTS
+run_black() {
+    echo "Running black..."
+    black -C --check --diff . ${PYTHON_SCRIPTS}
+}
 
-echo "Running isort..."
-isort --check-only --diff .
+run_isort() {
+    echo "Running isort..."
+    isort --check-only --diff .
+}
 
-echo "Running flake8..."
-flake8 --max-line-length=99 --ignore=E203,W503 . $PYTHON_SCRIPTS
+run_flake8() {
+    echo "Running flake8..."
+    flake8 --max-line-length=99 --ignore=E203,W503 . $PYTHON_SCRIPTS
+}
 
-echo "Running pylint..."
-pylint $(find * -name '*.py') $PYTHON_SCRIPTS
+run_mypy() {
+    echo "Running mypy..."
+    mypy .
+    mypy --scripts-are-modules $PYTHON_SCRIPTS
+}
+
+run_pylint() {
+    echo "Running pylint..."
+    pylint "$@" $(find * -name '*.py') $PYTHON_SCRIPTS
+}
+
+if test "${1-}" = "--errors-only"; then
+    # Run only linters that can detect real errors (ignore formatting)
+    run_black || true
+    run_isort || true
+    run_flake8 || true
+    run_mypy
+    run_pylint --errors-only
+else
+    run_black
+    run_isort
+    run_flake8
+    run_mypy
+    run_pylint
+fi

syncpackage

@@ -22,6 +22,7 @@
 
 import argparse
 import fnmatch
+import functools
 import logging
 import os
 import shutil
@@ -143,7 +144,7 @@ def sync_dsc(
     if ubuntu_ver.is_modified_in_ubuntu():
         if not force:
             Logger.error("--force is required to discard Ubuntu changes.")
-            sys.exit(1)
+            return None
 
         Logger.warning(
             "Overwriting modified Ubuntu version %s, setting current version to %s",
@@ -157,7 +158,7 @@ def sync_dsc(
         src_pkg.pull()
     except DownloadError as e:
         Logger.error("Failed to download: %s", str(e))
-        sys.exit(1)
+        return None
     src_pkg.unpack()
 
     needs_fakesync = not (need_orig or ubu_pkg.verify_orig())
@@ -166,13 +167,13 @@ def sync_dsc(
         Logger.warning("Performing a fakesync")
     elif not needs_fakesync and fakesync:
         Logger.error("Fakesync not required, aborting.")
-        sys.exit(1)
+        return None
     elif needs_fakesync and not fakesync:
         Logger.error(
             "The checksums of the Debian and Ubuntu packages "
             "mismatch. A fake sync using --fakesync is required."
         )
-        sys.exit(1)
+        return None
 
     if fakesync:
         # Download Ubuntu files (override Debian source tarballs)
@@ -180,7 +181,7 @@ def sync_dsc(
             ubu_pkg.pull()
         except DownloadError as e:
             Logger.error("Failed to download: %s", str(e))
-            sys.exit(1)
+            return None
 
     # change into package directory
     directory = src_pkg.source + "-" + new_ver.upstream_version
@@ -265,7 +266,7 @@ def sync_dsc(
         returncode = subprocess.call(cmd)
         if returncode != 0:
             Logger.error("Source-only build with debuild failed. Please check build log above.")
-            sys.exit(1)
+            return None
 
 
 def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
@@ -295,7 +296,7 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
             udtexceptions.SeriesNotFoundException,
         ) as e:
             Logger.error(str(e))
-            sys.exit(1)
+            return None
         if version is None:
             version = Version(debian_srcpkg.getVersion())
         try:
@@ -306,7 +307,7 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
             ubuntu_version = Version("~")
         except udtexceptions.SeriesNotFoundException as e:
             Logger.error(str(e))
-            sys.exit(1)
+            return None
         if ubuntu_version >= version:
             # The LP importer is maybe out of date
             debian_srcpkg = requestsync_mail_get_debian_srcpkg(package, dist)
@@ -320,7 +321,7 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
                     ubuntu_version,
                     ubuntu_release,
                 )
-                sys.exit(1)
+                return None
         if component is None:
             component = debian_srcpkg.getComponent()
 
@@ -329,7 +330,7 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
     return DebianSourcePackage(package, version.full_version, component, mirrors=mirrors)
 
 
-def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False):
+def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False, yes=False):
     """Copy a source package from Debian to Ubuntu using the Launchpad API."""
     ubuntu = Distribution("ubuntu")
     debian_archive = Distribution("debian").getArchive()
@@ -352,7 +353,7 @@ def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False):
             "Debian version %s has not been picked up by LP yet. Please try again later.",
             src_pkg.version,
         )
-        sys.exit(1)
+        return None
 
     try:
         ubuntu_spph = get_ubuntu_srcpkg(src_pkg.source, ubuntu_series, ubuntu_pocket)
@@ -373,7 +374,7 @@ def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False):
         base_version = ubuntu_version.get_related_debian_version()
         if not force and ubuntu_version.is_modified_in_ubuntu():
             Logger.error("--force is required to discard Ubuntu changes.")
-            sys.exit(1)
+            return None
 
         # Check whether a fakesync would be required.
         if not src_pkg.dsc.compare_dsc(ubuntu_pkg.dsc):
@@ -381,7 +382,7 @@ def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False):
                 "The checksums of the Debian and Ubuntu packages "
                 "mismatch. A fake sync using --fakesync is required."
             )
-            sys.exit(1)
+            return None
     except udtexceptions.PackageNotFoundException:
         base_version = Version("~")
         Logger.info(
@@ -402,6 +403,7 @@ def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False):
 
     if sponsoree:
         Logger.info("Sponsoring this sync for %s (%s)", sponsoree.display_name, sponsoree.name)
+    if not yes:
         answer = YesNoQuestion().ask("Sync this package", "no")
         if answer != "yes":
             return
@@ -419,26 +421,37 @@ def copy(src_pkg, release, bugs, sponsoree=None, simulate=False, force=False):
     except HTTPError as error:
         Logger.error("HTTP Error %s: %s", error.response.status, error.response.reason)
         Logger.error(error.content)
-        sys.exit(1)
+        return None
 
     Logger.info("Request succeeded; you should get an e-mail once it is processed.")
     bugs = sorted(set(bugs))
     if bugs:
         Logger.info("Launchpad bugs to be closed: %s", ", ".join(str(bug) for bug in bugs))
         Logger.info("Please wait for the sync to be successful before closing bugs.")
+        if yes:
+            close_bugs(bugs, src_pkg.source, src_pkg.version.full_version, changes, sponsoree)
+        else:
             answer = YesNoQuestion().ask("Close bugs", "yes")
             if answer == "yes":
                 close_bugs(bugs, src_pkg.source, src_pkg.version.full_version, changes, sponsoree)
 
 
-def is_blacklisted(query):
-    """Determine if package "query" is in the sync blacklist
-    Returns tuple of (blacklisted, comments)
-    blacklisted is one of False, 'CURRENT', 'ALWAYS'
+@functools.lru_cache(maxsize=1)
+def _fetch_sync_blocklist() -> str:
+    url = "https://ubuntu-archive-team.ubuntu.com/sync-blocklist.txt"
+    with urllib.request.urlopen(url) as f:
+        sync_blocklist = f.read().decode("utf-8")
+    return sync_blocklist
+
+
+def is_blocklisted(query):
+    """Determine if package "query" is in the sync blocklist
+    Returns tuple of (blocklisted, comments)
+    blocklisted is one of False, 'CURRENT', 'ALWAYS'
     """
     series = Launchpad.distributions["ubuntu"].current_series
     lp_comments = series.getDifferenceComments(source_package_name=query)
-    blacklisted = False
+    blocklisted = False
     comments = [
         f"{c.body_text}\n  -- {c.comment_author.name}"
         f"  {c.comment_date.strftime('%a, %d %b %Y %H:%M:%S +0000')}"
@@ -446,17 +459,19 @@ def is_blacklisted(query):
     ]
 
     for diff in series.getDifferencesTo(source_package_name_filter=query):
-        if diff.status == "Blacklisted current version" and blacklisted != "ALWAYS":
-            blacklisted = "CURRENT"
+        if diff.status == "Blacklisted current version" and blocklisted != "ALWAYS":
+            blocklisted = "CURRENT"
         if diff.status == "Blacklisted always":
-            blacklisted = "ALWAYS"
+            blocklisted = "ALWAYS"
+
+    try:
+        sync_blocklist = _fetch_sync_blocklist()
+    except OSError:
+        print("WARNING: unable to download the sync blocklist. Erring on the side of caution.")
+        return ("ALWAYS", "INTERNAL ERROR: Unable to fetch sync blocklist")
 
-    # Old blacklist:
-    url = "https://ubuntu-archive-team.ubuntu.com/sync-blacklist.txt"
-    with urllib.request.urlopen(url) as f:
     applicable_lines = []
-        for line in f:
-            line = line.decode("utf-8")
+    for line in sync_blocklist.splitlines():
         if not line.strip():
             applicable_lines = []
             continue
@@ -467,11 +482,11 @@ def is_blacklisted(query):
             pass
         source = line.strip()
         if source and fnmatch.fnmatch(query, source):
-                comments += ["From sync-blacklist.txt:"] + applicable_lines
-                blacklisted = "ALWAYS"
+            comments += ["From sync-blocklist.txt:"] + applicable_lines
+            blocklisted = "ALWAYS"
             break
 
-    return (blacklisted, comments)
+    return (blocklisted, comments)
 
 
 def close_bugs(bugs, package, version, changes, sponsoree):
@@ -508,6 +523,12 @@ def parse():
     epilog = f"See {os.path.basename(sys.argv[0])}(1) for more info."
     parser = argparse.ArgumentParser(usage=usage, epilog=epilog)
 
+    parser.add_argument(
+        "-y",
+        "--yes",
+        action="store_true",
+        help="Automatically sync without prompting. Use with caution and care.",
+    )
     parser.add_argument("-d", "--distribution", help="Debian distribution to sync from.")
     parser.add_argument("-r", "--release", help="Specify target Ubuntu release.")
     parser.add_argument("-V", "--debian-version", help="Specify the version to sync from.")
@@ -712,36 +733,38 @@ def main():
             args.release,
             args.debian_mirror,
         )
+        if not src_pkg:
+            continue
 
-        blacklisted, comments = is_blacklisted(src_pkg.source)
-        blacklist_fail = False
-        if blacklisted:
+        blocklisted, comments = is_blocklisted(src_pkg.source)
+        blocklist_fail = False
+        if blocklisted:
             messages = []
 
-            if blacklisted == "CURRENT":
+            if blocklisted == "CURRENT":
                 Logger.debug(
-                    "Source package %s is temporarily blacklisted "
-                    "(blacklisted_current). "
+                    "Source package %s is temporarily blocklisted "
+                    "(blocklisted_current). "
                     "Ubuntu ignores these for now. "
                     "See also LP: #841372",
                     src_pkg.source,
                 )
             else:
                 if args.fakesync:
-                    messages += ["Doing a fakesync, overriding blacklist."]
+                    messages += ["Doing a fakesync, overriding blocklist."]
                 else:
-                    blacklist_fail = True
+                    blocklist_fail = True
                     messages += [
                         "If this package needs a fakesync, use --fakesync",
                         "If you think this package shouldn't be "
-                        "blacklisted, please file a bug explaining your "
+                        "blocklisted, please file a bug explaining your "
                         "reasoning and subscribe ~ubuntu-archive.",
                     ]
 
-            if blacklist_fail:
-                Logger.error("Source package %s is blacklisted.", src_pkg.source)
-            elif blacklisted == "ALWAYS":
-                Logger.info("Source package %s is blacklisted.", src_pkg.source)
+            if blocklist_fail:
+                Logger.error("Source package %s is blocklisted.", src_pkg.source)
+            elif blocklisted == "ALWAYS":
+                Logger.info("Source package %s is blocklisted.", src_pkg.source)
             if messages:
                 for message in messages:
                     for line in textwrap.wrap(message):
@@ -753,14 +776,17 @@ def main():
                 for line in textwrap.wrap(comment):
                     Logger.info("  %s", line)
 
-        if blacklist_fail:
-            sys.exit(1)
+        if blocklist_fail:
+            continue
 
         if args.lp:
-            copy(src_pkg, args.release, args.bugs, sponsoree, args.simulate, args.force)
+            if not copy(
+                src_pkg, args.release, args.bugs, sponsoree, args.simulate, args.force, args.yes
+            ):
+                continue
         else:
             os.environ["DEB_VENDOR"] = "Ubuntu"
-            sync_dsc(
+            if not sync_dsc(
                 src_pkg,
                 args.distribution,
                 args.release,
@@ -772,7 +798,8 @@ def main():
                 args.simulate,
                 args.force,
                 args.fakesync,
-            )
+            ):
+                continue
 
 
 if __name__ == "__main__":

ubuntu-build

@@ -87,17 +87,13 @@ def retry_builds(pkg, archs):
     return f"Retrying builds of '{pkg.source_package_name}':\n{msg}"
 
 
-def main():
+def parse_args(argv: list[str], valid_archs: set[str]) -> argparse.Namespace:
+    """Parse command line arguments and return namespace."""
     # Usage.
     usage = "%(prog)s <srcpackage> <release> <operation>\n\n"
     usage += "Where operation may be one of: rescore, retry, or status.\n"
     usage += "Only Launchpad Buildd Admins may rescore package builds."
 
-    # Valid architectures.
-    valid_archs = set(
-        ["armhf", "arm64", "amd64", "i386", "powerpc", "ppc64el", "riscv64", "s390x"]
-    )
-
     # Prepare our option parser.
     parser = argparse.ArgumentParser(usage=usage)
 
@@ -148,7 +144,23 @@ def main():
     parser.add_argument("packages", metavar="package", nargs="*", help=argparse.SUPPRESS)
 
     # Parse our options.
-    args = parser.parse_args()
+    args = parser.parse_args(argv)
+
+    if not args.batch:
+        # Check we have the correct number of arguments.
+        if len(args.packages) < 3:
+            parser.error("Incorrect number of arguments.")
+
+    return args
+
+
+def main():
+    # Valid architectures.
+    valid_archs = set(
+        ["armhf", "arm64", "amd64", "amd64v3", "i386", "powerpc", "ppc64el", "riscv64", "s390x"]
+    )
+
+    args = parse_args(sys.argv[1:], valid_archs)
 
     launchpad = Launchpad.login_with("ubuntu-dev-tools", "production", version="devel")
     ubuntu = launchpad.distributions["ubuntu"]
@@ -167,21 +179,13 @@ def main():
             Logger.error(error)
             sys.exit(1)
     else:
-        # Check we have the correct number of arguments.
-        if len(args.packages) < 3:
-            parser.error("Incorrect number of arguments.")
-
-        try:
         package = str(args.packages[0]).lower()
         release = str(args.packages[1]).lower()
         operation = str(args.packages[2]).lower()
-        except IndexError:
-            parser.print_help()
-            sys.exit(1)
 
     archive = launchpad.archives.getByReference(reference=args.archive)
     try:
-        distroseries = ubuntu.getSeries(name_or_version=release)
+        distroseries = ubuntu.getSeries(name_or_version=release.split("-")[0])
     except lazr.restfulclient.errors.NotFound as error:
         Logger.error(error)
         sys.exit(1)
@@ -234,11 +238,11 @@ def main():
         # are in place.
         if operation == "retry":
             necessary_privs = archive.checkUpload(
-                component=sources.getComponent(),
+                component=component,
                 distroseries=distroseries,
                 person=launchpad.me,
                 pocket=pocket,
-                sourcepackagename=sources.getPackageName(),
+                sourcepackagename=sources.source_package_name,
             )
             if not necessary_privs:
                 Logger.error(

ubuntu-iso

@@ -65,7 +65,7 @@ def main():
             err = True
             continue
 
-        Logger.info(prefix + version)
+        Logger.info("%s%s", prefix, version)
 
     if err:
         sys.exit(1)

ubuntutools/archive.py

@@ -165,6 +165,7 @@ class SourcePackage(ABC):
         series = kwargs.get("series")
         pocket = kwargs.get("pocket")
         status = kwargs.get("status")
+        arch = kwargs.get("arch")
         verify_signature = kwargs.get("verify_signature", False)
         try_binary = kwargs.get("try_binary", True)
 
@@ -184,6 +185,7 @@ class SourcePackage(ABC):
         self._series = series
         self._pocket = pocket
         self._status = status
+        self._arch = arch
         # dscfile can be either a path or an URL.  misc.py's download() will
         # later fiture it out
         self._dsc_source = dscfile
@@ -252,6 +254,7 @@ class SourcePackage(ABC):
             )
 
             try:
+                params["archtag"] = self._arch
                 bpph = archive.getBinaryPackage(self.source, **params)
             except PackageNotFoundException as bpnfe:
                 # log binary lookup failure, in case it provides hints
@@ -337,11 +340,9 @@ class SourcePackage(ABC):
     def _archive_servers(self):
         "Generator for mirror and master servers"
         # Always provide the mirrors first
-        for server in self.mirrors:
-            yield server
+        yield from self.mirrors
         # Don't repeat servers that are in both mirrors and masters
-        for server in set(self.masters) - set(self.mirrors):
-            yield server
+        yield from set(self.masters) - set(self.mirrors)
 
     def _source_urls(self, name):
         "Generator of sources for name"
@@ -632,8 +633,7 @@ class DebianSourcePackage(SourcePackage):
 
     def _source_urls(self, name):
         "Generator of sources for name"
-        for url in super()._source_urls(name):
-            yield url
+        yield from super()._source_urls(name)
         if name in self.snapshot_files:
             yield self.snapshot_files[name]
 
@@ -731,6 +731,7 @@ class PersonalPackageArchiveSourcePackage(UbuntuSourcePackage):
 
 class UbuntuCloudArchiveSourcePackage(PersonalPackageArchiveSourcePackage):
     "Download / unpack an Ubuntu Cloud Archive source package"
+
     TEAM = "ubuntu-cloud-archive"
     PROJECT = "cloud-archive"
     VALID_POCKETS = ["updates", "proposed", "staging"]
@@ -927,8 +928,8 @@ class UbuntuCloudArchiveSourcePackage(PersonalPackageArchiveSourcePackage):
 
 
 class _WebJSON:
-    def getHostUrl(self):  # pylint: disable=no-self-use
-        raise Exception("Not implemented")
+    def getHostUrl(self):
+        raise NotImplementedError(f"{self.__class__.__name__}.getHostUrl() is not implemented")
 
     def load(self, path=""):
         reader = codecs.getreader("utf-8")

ubuntutools/config.py

@@ -50,7 +50,7 @@ class UDTConfig:
         "KEYID": None,
     }
     # Populated from the configuration files:
-    config = {}
+    config: dict[str, str] = {}
 
     def __init__(self, no_conf=False, prefix=None):
         self.no_conf = no_conf
@@ -61,28 +61,26 @@ class UDTConfig:
             self.config = self.parse_devscripts_config()
 
     @staticmethod
-    def parse_devscripts_config():
+    def parse_devscripts_config() -> dict[str, str]:
         """Read the devscripts configuration files, and return the values as a
         dictionary
         """
         config = {}
         for filename in ("/etc/devscripts.conf", "~/.devscripts"):
             try:
-                f = open(os.path.expanduser(filename), "r", encoding="utf-8")
+                with open(os.path.expanduser(filename), "r", encoding="utf-8") as f:
+                    content = f.read()
             except IOError:
                 continue
-            for line in f:
-                parsed = shlex.split(line, comments=True)
-                if len(parsed) > 1:
-                    Logger.warning(
-                        "Cannot parse variable assignment in %s: %s",
-                        getattr(f, "name", "<config>"),
-                        line,
-                    )
-                if len(parsed) >= 1 and "=" in parsed[0]:
-                    key, value = parsed[0].split("=", 1)
+            try:
+                tokens = shlex.split(content, comments=True)
+            except ValueError as e:
+                Logger.error("Error parsing %s: %s", filename, e)
+                continue
+            for token in tokens:
+                if "=" in token:
+                    key, value = token.split("=", 1)
                     config[key] = value
-            f.close()
         return config
 
     def get_value(self, key, default=None, boolean=False, compat_keys=()):

ubuntutools/lp/lpapicache.py

@@ -26,6 +26,7 @@ import logging
 import os
 import re
 from copy import copy
+from typing import Any
 from urllib.error import URLError
 from urllib.parse import urlparse
 
@@ -139,7 +140,7 @@ class BaseWrapper(metaclass=MetaWrapper):
     A base class from which other wrapper classes are derived.
     """
 
-    resource_type: str = None  # it's a base class after all
+    resource_type: str | tuple[str, str] = ""  # it's a base class after all
 
     def __new__(cls, data):
         if isinstance(data, str) and data.startswith(str(Launchpad._root_uri)):
@@ -290,9 +291,8 @@ class Distribution(BaseWrapper):
         Returns a list of all DistroSeries objects.
         """
         if not self._have_all_series:
-            for series in Launchpad.load(self.series_collection_link).entries:
-                series_link = DistroSeries(series["self_link"])
-                self._cache_series(series_link)
+            for series in self.series:
+                self._cache_series(DistroSeries(series))
             self._have_all_series = True
 
         allseries = filter(lambda s: s.active, self._series.values())
@@ -668,20 +668,19 @@ class Archive(BaseWrapper):
                     rversion = getattr(record, "binary_package_version", None)
                 else:
                     rversion = getattr(record, "source_package_version", None)
-                skipmsg = f"Skipping version {rversion}: "
 
                 if record.pocket not in pockets:
                     err_msg = f"pocket {record.pocket} not in ({','.join(pockets)})"
-                    Logger.debug(skipmsg + err_msg)
+                    Logger.debug("Skipping version %s: %s", rversion, err_msg)
                     continue
                 if record.status not in statuses:
                     err_msg = f"status {record.status} not in ({','.join(statuses)})"
-                    Logger.debug(skipmsg + err_msg)
+                    Logger.debug("Skipping version %s: %s", rversion, err_msg)
                     continue
                 release = wrapper(record)
                 if binary and archtag and archtag != release.arch:
                     err_msg = f"arch {release.arch} does not match requested arch {archtag}"
-                    Logger.debug(skipmsg + err_msg)
+                    Logger.debug("Skipping version %s: %s", rversion, err_msg)
                     continue
                 # results are ordered so first is latest
                 cache[index] = release
@@ -1406,10 +1405,7 @@ class PersonTeam(BaseWrapper, metaclass=MetaPersonTeam):
 
     def getPPAs(self):
         if self._ppas is None:
-            ppas = [
-                Archive(ppa["self_link"])
-                for ppa in Launchpad.load(self._lpobject.ppas_collection_link).entries
-            ]
+            ppas = [Archive(ppa) for ppa in self._lpobject.ppas]
             self._ppas = {ppa.name: ppa for ppa in ppas}
         return self._ppas
 
@@ -1434,10 +1430,7 @@ class Project(BaseWrapper):
         The list will be sorted by date_created, in descending order.
         """
         if not self._series:
-            series = [
-                ProjectSeries(s["self_link"])
-                for s in Launchpad.load(self._lpobject.series_collection_link).entries
-            ]
+            series = [ProjectSeries(s) for s in self._lpobject.series]
             self._series = sorted(series, key=lambda s: s.date_created, reverse=True)
         return self._series.copy()
 
@@ -1509,7 +1502,7 @@ class Packageset(BaseWrapper):  # pylint: disable=too-few-public-methods
 
     resource_type = "packageset"
     _lp_packagesets = None
-    _source_sets = {}
+    _source_sets: dict[tuple[str, str | None, bool], Any] = {}
 
     @classmethod
     def setsIncludingSource(cls, sourcepackagename, distroseries=None, direct_inclusion=False):

ubuntutools/pullpkg.py

@@ -340,6 +340,7 @@ class PullPkg:
 
         params = {}
         params["package"] = options["package"]
+        params["arch"] = options["arch"]
 
         if options["release"]:
             (release, version, pocket) = self.parse_release_and_version(
@@ -435,7 +436,7 @@ class PullPkg:
         if options["upload_queue"]:
             # upload queue API is different/simpler
             self.pull_upload_queue(  # pylint: disable=missing-kwoa
-                pull, arch=options["arch"], download_only=options["download_only"], **params
+                pull, download_only=options["download_only"], **params
             )
             return
 
@@ -470,6 +471,7 @@ class PullPkg:
                     uri,
                 )
 
+                vcscmd = ""
                 if vcs == "Bazaar":
                     vcscmd = " $ bzr branch " + uri
                 elif vcs == "Git":

ubuntutools/requestsync/mail.py

@@ -62,8 +62,17 @@ def get_debian_srcpkg(name, release):
     return DebianSourcePackage(package=name, series=release).lp_spph
 
 
-def get_ubuntu_srcpkg(name, release):
-    return UbuntuSourcePackage(package=name, series=release).lp_spph
+def get_ubuntu_srcpkg(name, release, pocket="Proposed"):
+    srcpkg = UbuntuSourcePackage(package=name, series=release, pocket=pocket)
+    try:
+        return srcpkg.lp_spph
+    except PackageNotFoundException:
+        if pocket != "Release":
+            parent_pocket = "Release"
+            if pocket == "Updates":
+                parent_pocket = "Proposed"
+            return get_ubuntu_srcpkg(name, release, parent_pocket)
+        raise
 
 
 def need_sponsorship(name, component, release):

ubuntutools/sponsor_patch/question.py

@@ -16,6 +16,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import sys
+from typing import NoReturn
 
 from ubuntutools.question import Question, YesNoQuestion
 
@@ -42,7 +43,7 @@ def ask_for_manual_fixing():
         user_abort()
 
 
-def user_abort():
+def user_abort() -> NoReturn:
     """Print abort and quit the program."""
 
     print("User abort.")

ubuntutools/sponsor_patch/source_package.py

@@ -17,6 +17,7 @@
 
 import logging
 import os
+import pathlib
 import re
 import subprocess
 import sys
@@ -407,22 +408,16 @@ class SourcePackage:
 
         return True
 
-    def _run_lintian(self):
+    def _run_lintian(self) -> str:
         """Runs lintian on either the source or binary changes file.
 
         Returns the filename of the created lintian output file.
         """
 
         # Determine whether to use the source or binary build for lintian
+        package_and_version = f"{self._package}_{strip_epoch(self._version)}"
         if self._build_log:
-            build_changes = (
-                self._package
-                + "_"
-                + strip_epoch(self._version)
-                + "_"
-                + self._builder.get_architecture()
-                + ".changes"
-            )
+            build_changes = f"{package_and_version}_{self._builder.get_architecture()}.changes"
             changes_for_lintian = os.path.join(self._buildresult, build_changes)
         else:
             changes_for_lintian = self._changes_file
@@ -430,18 +425,12 @@ class SourcePackage:
         # Check lintian
         assert os.path.isfile(changes_for_lintian), f"{changes_for_lintian} does not exist."
         cmd = ["lintian", "-IE", "--pedantic", "-q", "--profile", "ubuntu", changes_for_lintian]
-        lintian_filename = os.path.join(
-            self._workdir, self._package + "_" + strip_epoch(self._version) + ".lintian"
-        )
-        Logger.debug("%s > %s", " ".join(cmd), lintian_filename)
-        report = subprocess.check_output(cmd, encoding="utf-8")
+        lintian_file = pathlib.Path(self._workdir) / f"{package_and_version}.lintian"
+        Logger.debug("%s > %s", " ".join(cmd), lintian_file)
+        with lintian_file.open("wb") as outfile:
+            subprocess.run(cmd, stdout=outfile, check=True)
 
-        # write lintian report file
-        lintian_file = open(lintian_filename, "w", encoding="utf-8")
-        lintian_file.writelines(report)
-        lintian_file.close()
-
-        return lintian_filename
+        return str(lintian_file)
 
     def sync(self, upload, series, bug_number, requester):
         """Does a sync of the source package."""

ubuntutools/sponsor_patch/sponsor_patch.py

@@ -46,11 +46,9 @@ def is_command_available(command, check_sbin=False):
 def check_dependencies():
     "Do we have all the commands we need for full functionality?"
     missing = []
-    for cmd in ("patch", "bzr", "quilt", "dput", "lintian"):
+    for cmd in ("patch", "quilt", "dput", "lintian"):
         if not is_command_available(cmd):
             missing.append(cmd)
-    if not is_command_available("bzr-buildpackage"):
-        missing.append("bzr-builddeb")
     if not any(
         is_command_available(cmd, check_sbin=True) for cmd in ("pbuilder", "sbuild", "cowbuilder")
     ):
@@ -212,14 +210,14 @@ def get_open_ubuntu_bug_task(launchpad, bug, branch=None):
         sys.exit(1)
     elif len(ubuntu_tasks) == 1:
         task = ubuntu_tasks[0]
-    if len(ubuntu_tasks) > 1 and branch and branch[1] == "ubuntu":
+    elif branch and branch[1] == "ubuntu":
         tasks = [t for t in ubuntu_tasks if t.get_series() == branch[2] and t.package == branch[3]]
         if len(tasks) > 1:
             # A bug targeted to the development series?
             tasks = [t for t in tasks if t.series is not None]
         assert len(tasks) == 1
         task = tasks[0]
-    elif len(ubuntu_tasks) > 1:
+    else:
         task_list = [t.get_short_info() for t in ubuntu_tasks]
         Logger.debug(
             "%i Ubuntu tasks exist for bug #%i.\n%s",

ubuntutools/test/example_package.py

@@ -60,7 +60,7 @@ class ExamplePackage:
         with tempfile.TemporaryDirectory() as tmpdir:
             self._create(Path(tmpdir))
 
-    def _create(self, directory: Path):
+    def _create(self, directory: Path) -> None:
         pkgdir = directory / self.dirname
         pkgdir.mkdir()
         (pkgdir / self.content_filename).write_text(self.content_text)

ubuntutools/test/test_requestsync.py

@@ -28,6 +28,7 @@ class BinaryTests(unittest.TestCase):
     def test_keyring_installed(self):
         """Smoke test for required lp api dependencies"""
         try:
+            # pylint: disable-next=import-outside-toplevel,unused-import
             import keyring  # noqa: F401
-        except ModuleNotFoundError:
-            raise ModuleNotFoundError("package python3-keyring is not installed")
+        except ModuleNotFoundError as error:
+            raise ModuleNotFoundError("package python3-keyring is not installed") from error

ubuntutools/test/test_running_autopkgtests.py

@@ -12,7 +12,7 @@
 # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
-""" Tests for running_autopkgtests
+"""Tests for running_autopkgtests
 Tests using cached data from autopkgtest servers.
 
 These tests only ensure code changes don't change parsing behavior