Use diff3 conflict style, which gives more information.

[wizard.git] / wizard / command / list.py

diff --git a/wizard/command/list.py b/wizard/command/list.py
index e8c51268fea96983b24058fb2ecaecda53b7db93..bb0ad575d784cd42974972ae09a4aca428766be6 100644 (file)
--- a/wizard/command/list.py
+++ b/wizard/command/list.py
@@ -1,5 +1,4 @@
 import logging
-import traceback
 import os.path
 
 from wizard import command, deploy
@@ -7,9 +6,10 @@ from wizard import command, deploy
 def main(argv, baton):
     options, show = parse_args(argv, baton)
     errors = 0
-    for d in deploy.parse_install_lines(show, options, True):
+    for d in deploy.parse_install_lines(show, options.versions_path, True, user=options.user):
         if isinstance(d, Exception):
             errors += 1
+            continue
         if options.exists and not os.path.exists(os.path.join(d.location, options.exists)):
             continue
         print d.location
@@ -35,6 +35,7 @@ Examples:
     parser.add_option("-e", "--exists", dest="exists",
             help="only print deployment if FILE exists", metavar="FILE")
     baton.push(parser, "versions_path")
+    baton.push(parser, "user")
     options, args = parser.parse_all(argv)
     if len(args) > 1:
         parser.error("too many arguments")