Allow using the format <DISTRO>/<PACKAGE> for submit groups

It will expand <DISTRO>/<PACKAGE> for each package name of the group (using
the same <DISTRO> of course.)

We must allow it as the option -d (which would be used for --distro) would
be confused with --define, so we'd better use the standard format that is
available for all other commands.

2 files changed, 10 insertions, 1 deletions

diff --git a/BRANCH b/BRANCH
index 1ca2278..366ac76 100644
--- a/BRANCH
+++ b/BRANCH
@@ -21,6 +21,8 @@ Notes
 
 - No support for using the <distro>/<package> format. The -d command line
   option should be used.
+  (actually it turned out to be really needed, as we can't use -d [I plan
+   to use -d for --define])
 
 
 TODO
diff --git a/RepSys/commands/submit.py b/RepSys/commands/submit.py
index 79129f1..c4a0c05 100644
--- a/RepSys/commands/submit.py
+++ b/RepSys/commands/submit.py
@@ -102,12 +102,19 @@ def parse_options():
 
 def expand_group(group):
     name, rev = layout.split_url_revision(group)
+    distro = None
+    if "/" in name:
+        distro, name = name.rsplit("/", 1)
     found = config.get("submit-groups", name)
     packages = [group]
     if found:
         packages = found.split()
         if rev:
-            packages = [("%s@%s" % package) for package in packages]
+            packages = [("%s@%s" % (package, rev))
+                    for package in packages]
+        if distro:
+            packages = ["%s/%s" % (distro, package)
+                    for package in packages]
     return packages
 
 def list_targets(option, opt, val, parser):