Cleanup and fixes.

diff --git a/freshmeat-submit b/freshmeat-submit
index 1929b082debcac112c57c0658a6d3e86bca81992..424d723f919545cd82286a935784cd8a031840d5 100755 (executable)
--- a/freshmeat-submit
+++ b/freshmeat-submit
@@ -160,11 +160,13 @@ class FreshmeatMetadataFactory:
                 if key.endswith("-URL"):
                     urls.update({key[:-4] : value})
                 else:
+                    if key.endswith("List"):
+                        value = map(lambda x: x.strip(), value.split())
                     data.update({self.header_to_field(key) : value})
             if not 'changes' in data:
                 data['changes'] = message.get_payload()
             if prior_version and data.get("version") != prior_version:
-                raise FreshmeatSessionException("Version number conflict on stdin.")
+                raise FreshmeatSessionException("Version conflict on stdin.")
         # Merge in options from the command line;
         # they override what's on stdin.
         prior_version = data.get("version")
@@ -173,14 +175,17 @@ class FreshmeatMetadataFactory:
             if key != 'read' and value != None:
                 data[key] = value
         if data.get("version") != prior_version:
-            raise FreshmeatSessionException("Version number conflict in options.")
-        # Release-Focus field special handling
+            raise FreshmeatSessionException("Version conflict in options.")
+        # Release-Focus field special handling.
         if "release_focus" in data:
             if data["release_focus"] in '123456789':
                 data["release_focus"] = focus_values[int(data["release_focus"])-1]
             if data["release_focus"] not in focus_values:
                 raise FreshmeatSessionException("Invalid release focus")
-            data["tag_list"] = data["release_focus" ]
+            if "tag_list" not in data:
+                data["tag_list"] = data["release_focus" ]
+            else:
+                data["tag_list"].append(data["release_focus" ])
             del data["release_focus"]
         # Now merge in the URLs, doing symbol substitution
         data['approved_urls'] = []

diff --git a/freshmeat-submit.xml b/freshmeat-submit.xml
index 34d28836e14262d5698ffe577bf8a1646bd6bf78..227e5040534ac30fd43b03041a299b680576ca97 100644 (file)
--- a/freshmeat-submit.xml
+++ b/freshmeat-submit.xml
@@ -152,6 +152,14 @@ below.</para>
 </entry>
 </row>
 
+<row>
+<entry>Tag-List:</entry>     <entry>-</entry>
+<entry>-t</entry><entry>--tag-list</entry>
+<entry>
+<para>Tags to attach to this release. May be a comma-separated list.</para>
+</entry>
+</row>
+
 <row>
 <entry>Hide:</entry>              <entry>-</entry>
 <entry>-x</entry><entry>--hide</entry>
@@ -162,11 +170,11 @@ release will not be visible on the project page.</para>
 </row>
 
 <row>
-<entry>License:</entry>          <entry>-</entry>
-<entry>-l</entry><entry>--license</entry>
+<entry>License-List:</entry>          <entry>-</entry>
+<entry>-l</entry><entry>--license-list</entry>
 <entry>
 <para>Specify the licenses under which the release is issued.  This
-may be a comma-reparated list. Note that this is not copied from the
+may be a comma-separated list. Note that this is not copied from the
 RPM License field, because the values don't map.</para>
 </entry>
 </row>
@@ -191,7 +199,7 @@ RPM License field, because the values don't map.</para>
 </informaltable>
 
 <para>The License-List and all URL fields, when specified, actually change
-the record for the project.  Only the Changes, Version,
+the record for the project.  Only the Tag-List, Changes, Version,
 Release-Focus, and Hide fields are actually stored for each
 version.</para>