Merge ppa-dev-tools:fix-lp1997122-and-other-errors into ppa-dev-tools:main

[Bryce Harrington]

This is a set of some small fixes to various issues that have cropped up.
Most don't have bug reports but are easy enough to reproduce and fixes pretty obvious.

[Andreas Hasenack (ahasenack)]

+1, working as advertised, and just the regexp suggestion inline, if that makes sense to you.

review: Approve

[Bryce Harrington (bryce)]

Thanks, this has been landed.

https://git.launchpad.net/ppa-dev-tools/commit/?id=eca439bc10433d9dbf7d3873869704bc3053f199

diff --git a/ppa/ppa.py b/ppa/ppa.py
index 0cccb10..f491a05 100755
--- a/ppa/ppa.py
+++ b/ppa/ppa.py
@@ -551,7 +551,9 @@ def ppa_address_split(ppa_address):
         ppa_name = rem.split('/', 1)[1]
     elif ppa_address.startswith('http'):
         # Only launchpad PPA urls are supported
-        m = re.search(r'https:\/\/launchpad\.net\/~([^/]+)\/\+archive\/ubuntu\/(.+)$', ppa_address)
+        m = re.search(
+            r'https:\/\/launchpad\.net\/~([^/]+)\/\+archive\/ubuntu\/([^/]+)(\/*|\/\+[a-z]+)$',
+            ppa_address)
         if not m:
             return (None, None)
         owner_name = m.group(1)
diff --git a/scripts/ppa b/scripts/ppa
index ee97f4d..8e4e5a9 100755
--- a/scripts/ppa
+++ b/scripts/ppa
@@ -55,6 +55,7 @@ from inspect import currentframe
 from textwrap import indent
 from typing import Any
 from distro_info import UbuntuDistroInfo
+from lazr.restfulclient.errors import BadRequest
 
 try:
     from ruamel import yaml
@@ -789,21 +790,30 @@ def command_wait(lp: Lp, config: dict[str, str]) -> int:
         name = config.get('name')
         the_ppa = get_ppa(lp, config)
         waiting = True
+        bad_request_count = 0
         while waiting:
-            if not the_ppa.has_packages(created_since_date=created_since_date, name=name):
-                print("Nothing present in PPA.  Waiting for new package uploads...")
-                # TODO: Only wait a configurable amount of time (15 min?)
-                waiting = True  # config['wait_for_packages']
-            else:
-                pending_reason = the_ppa.pending_publications(
-                    created_since_date=created_since_date,
-                    name=name
-                )
-                waiting = bool(pending_reason)
-                if config.get('exit_on_only_build_failure', False) and all(
-                    x == PendingReason.BUILD_FAILED for x in pending_reason):
-                    # If exiting due to not pending, return ok, else failure
-                    return 100 if pending_reason else os.EX_OK
+            try:
+                if not the_ppa.has_packages(created_since_date=created_since_date, name=name):
+                    print("Nothing present in PPA.  Waiting for new package uploads...")
+                    # TODO: Only wait a configurable amount of time (15 min?)
+                    waiting = True  # config['wait_for_packages']
+                else:
+                    pending_reason = the_ppa.pending_publications(
+                        created_since_date=created_since_date,
+                        name=name
+                    )
+                    waiting = bool(pending_reason)
+                    if config.get('exit_on_only_build_failure', False) and all(
+                        x == PendingReason.BUILD_FAILED for x in pending_reason):
+                        # If exiting due to not pending, return ok, else failure
+                        return 100 if pending_reason else os.EX_OK
+            except BadRequest as e:
+                if bad_request_count < 3:
+                    warn("BadRequest from Launchpad.  Retrying...")
+                    bad_request_count += 1
+                else:
+                    error(f"Launchpad failure: {e}")
+                    return os.EX_TEMPFAIL
             time.sleep(config['wait_seconds'])
         return os.EX_OK
     except PpaDoesNotExist as e:
@@ -982,7 +992,13 @@ def main(args: argparse.Namespace) -> int:
 
     lp = Lp('ppa-dev-tools')
 
-    config = create_config(lp, args)
+    try:
+        config = create_config(lp, args)
+    except KeyboardInterrupt:
+        return 2
+    except ValueError as e:
+        error(e)
+        return os.EX_CONFIG
     if not config:
         return os.EX_CONFIG
 
@@ -1002,6 +1018,7 @@ def main(args: argparse.Namespace) -> int:
         return func(lp, config, param)
     return func(lp, config)
 
+
 if __name__ == "__main__":
     # Option handling
     parser = create_arg_parser()
@@ -1011,4 +1028,6 @@ if __name__ == "__main__":
     if retval == os.EX_USAGE:
         print()
         parser.print_help()
+    elif retval == 2:
+        sys.stderr.write(" (user interrupt)\n")
     sys.exit(retval)
diff --git a/tests/test_ppa.py b/tests/test_ppa.py
index 9bb76e9..7e2e4bf 100644
--- a/tests/test_ppa.py
+++ b/tests/test_ppa.py
@@ -47,6 +47,10 @@ def test_address():
     ('ppa:a/bb', ('a', 'bb')),
     ('ppa:ç/bb', ('ç', 'bb')),
     ('https://launchpad.net/~a/+archive/ubuntu/bb', ('a', 'bb')),
+    ('https://launchpad.net/~a/+archive/ubuntu/bb/', ('a', 'bb')),
+    ('https://launchpad.net/~a/+archive/ubuntu/bb////', ('a', 'bb')),
+    ('https://launchpad.net/~a/+archive/ubuntu/bb/+packages', ('a', 'bb')),
+    ('https://launchpad.net/~a/+archive/ubuntu/bb/+x', ('a', 'bb')),
 
     # Expected failure cases
     ('ppa:', (None, None)),
@@ -65,6 +69,8 @@ def test_address():
     ('http://launchpad.net/~a/+archive/ubuntu/bb', (None, None)),
     ('https://example.com/~a/+archive/ubuntu/bb', (None, None)),
     ('https://launchpad.net/~a/+archive/nobuntu/bb', (None, None)),
+    ('https://launchpad.net/~a/+archive/ubuntu/bb/x', (None, None)),
+    ('https://launchpad.net/~a/+archive/ubuntu/bb/+', (None, None)),
 ])
 def test_ppa_address_split(address, expected):
     """Check ppa address input strings can be parsed properly."""