Make the tool canonicalize wrapped lines in input from stdin.

diff --git a/TEST b/TEST
index e37e275788cb1a769bb9569c66c99ecea9c3696b..05396bfa426c579df98802691cc769ac15b53427 100644 (file)
--- a/TEST
+++ b/TEST
@@ -1,4 +1,7 @@
 Project: freshmeat-submit
+Description: freshmeat-submit is a tool to submit version updates to 
+    freshmeat.net. It is designed to run from within a project release 
+    script or makefile production, and uses freshmeat.net's JSON API. 
 Version: 1.7
 Release-Focus: Major feature enhancements
 Hide: Y

diff --git a/freshmeat-submit b/freshmeat-submit
index 636ab0d2b6cd8ba7f459e132273e56c436520636..dfab24776941ec6dce8d384f9450452ab5fbe94e 100755 (executable)
--- a/freshmeat-submit
+++ b/freshmeat-submit
@@ -2,7 +2,7 @@
 #
 # freshmeat-submit -- script transactions with the Freshmeat server
 
-import sys
+import sys, re
 
 def error(m):
     sys.stderr.write("freshmeat-submit: %s\n" % m)
@@ -106,7 +106,7 @@ class FreshmeatSession:
         if self.verbose:
             print "Core data update for %s is: %s" % (self.project, coredata)
         self.edit_request("projects/" + self.permalink + ".json",
-                          {"project": data})
+                          {"project": coredata})
 
     def update_urls(self, urlassoc):
         "Update URL list for a project."
@@ -117,8 +117,6 @@ class FreshmeatSession:
                 % (self.permalink, self.auth)
         handle = urllib2.urlopen(query)
         content = json.loads(handle.read())
-        if self.verbose:
-            print "Returned URL list:", content
         permadict = {}
         for item in content:
             inner = item['url']
@@ -256,6 +254,7 @@ class FreshmeatMetadataFactory:
         if options.read:
             message = self.message_parser.parse(stream)
             for (key, value) in message.items():
+                value = re.sub("\n +", " ", value)
                 if key.endswith("-URL"):
                     urls.update({key[:-4] : value})
                 else: