Fix some bugs; parse error and erroring applications.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/TODO b/TODO
index 87d943e0cac452e42c702cf7254f81d4803cd18e..044dfd3352ab8be590e94c40e1ae575a9f4542ef 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,13 +3,12 @@ The Git Autoinstaller
 TODO NOW:
 
 - Consider making the history git-svn
-
-- Put php.ini links in repos
 - Consider adding user config to repository
+- Put php.ini links in repos (probably will need another
+  script in .scripts)
 
 - Consider making usermode wizard operation a support mode
   (mostly for letting users upgrade things themself)
-- Consider fixing Wizard commit history too
 
 - Add repository flag to migrate so that we can specify an
   arbitrary repository to migrate to
@@ -34,6 +33,7 @@ TODO NOW:
   output summary charts when I increase specificity
 - Check how many autoinstalls are missing w bits for
   daemon.scripts (this would need pyafs)
+- Consider fixing Wizard's commit messages
 
 COMMIT MESSAGE FIELDS:
 

diff --git a/wizard/command/migrate.py b/wizard/command/migrate.py
index 983c9bb15a58b57b8eca64a515d5ce6a8d8dd538..b93959e4fbd56b8c0fb3eed951efa94dc9d72243 100644 (file)
--- a/wizard/command/migrate.py
+++ b/wizard/command/migrate.py
@@ -96,7 +96,7 @@ def make_repository(sh, options, repo, tag):
         htaccess.close()
     else:
         logging.info("# create %s containing \"%s\"" % (file, data))
-        logging.info('# create .htaccess containing \"Deny from all\"")
+        logging.info('# create .htaccess containing "Deny from all"')
     # configure our remote (this is merely for convenience; wizard scripts
     # will not rely on this)
     sh.call("git", "remote", "add", "origin", repo)

diff --git a/wizard/command/summary.py b/wizard/command/summary.py
index e4512bcadcc6951a5c8a542c9df50d1f941b5d4d..b84ac5f8ec6dac6bbe3b270f7e2fc665ba84bb73 100644 (file)
--- a/wizard/command/summary.py
+++ b/wizard/command/summary.py
@@ -42,12 +42,11 @@ def parse_install_lines(show, options, global_options):
             continue
         except deploy.Error:
             errors += 1
-            logging.warning("Error from " + line)
+            logging.warning("Error from " + line.rstrip())
             continue
         logging.info("Found " + d.location)
         if name + "-" + str(d.getVersion()) in show:
-            print "%s-%s deployment at %s" \
-                % (name, d.getVersion(), d.location)
+            print d.location
         elif name in show:
             pass
         else:

diff --git a/wizard/deploy.py b/wizard/deploy.py
index 223abc7391d969857e8fb8bdc77966107e685527..2d5e2eb4ca8b17482f79211c03520077ceab3626 100644 (file)
--- a/wizard/deploy.py
+++ b/wizard/deploy.py
@@ -250,7 +250,7 @@ class ApplicationVersion(object):
                 version = raw_version[1:] # remove leading v
                 app, _ = raw_app.split(".") # remove trailing .git
             elif name.find("-") != -1:
-                app, version = name.split("-")
+                app, _, version = name.partition("-")
             # XXX: this should be removed after the next parallel-find run
             elif name == "deploy":
                 # Assume that it's django, since those were botched