obs: support Osmocom projects without prefix

Allow running build_srcpkg.py with "osmo_dia2gsup" instead of
"erlang/osmo_dia2gsup", because that's how it gets passed along from
jobs/gerrit-verifications.yml for the binary package build
verifications.

Related: OS#2385
Change-Id: I09304b219e7002495bd3fcce61bc68c34d5ffcd8

3 files changed, 12 insertions, 7 deletions

diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py
index 4c848b8..ad21927 100755
--- a/scripts/obs/build_srcpkg.py
+++ b/scripts/obs/build_srcpkg.py
@@ -37,7 +37,7 @@ def main():
         lib.check_required_programs()
 
     if args.package:
-        lib.check_package(args.package)
+        args.package = lib.set_proper_package_name(args.package)
     lib.remove_temp()
 
     if args.meta:
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index 5979623..479c1c1 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -78,11 +78,16 @@ def check_required_programs():
         exit(1)
 
 
-def check_package(package):
+def set_proper_package_name(package):
     if package in lib.config.projects_osmocom:
-        return
+        return package
     if package in lib.config.projects_other:
-        return
+        return package
+
+    # Add prefix to Osmocom package if missing
+    for package_cfg in lib.config.projects_osmocom:
+        if os.path.basename(package_cfg) == package:
+            return package_cfg
 
     print(f"ERROR: unknown package: {package}")
     print("See packages_osmocom and packages_other in obs/lib/config.py")
diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py
index 43748e9..86cf40a 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -20,13 +20,13 @@ srcpkgs_updated = []  # list of pkgnames
 
 
 def parse_packages(packages_arg):
+    ret = []
     if packages_arg:
         for package in packages_arg:
-            lib.check_package(package)
-        return packages_arg
+            ret += [lib.set_proper_package_name(package)]
+        return ret
 
     # Default to all
-    ret = []
     ret += lib.config.projects_osmocom
     ret += lib.config.projects_other
     return ret