Convert ad hoc shell calls to singleton instance; fix upgrade bug.

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

diff --git a/wizard/command/research.py b/wizard/command/research.py
index a95c32fcd07f7333a7f11600c6d51b9ca6cb9dc9..d36a850923d961f375440c115e59d600982ea401 100644 (file)
--- a/wizard/command/research.py
+++ b/wizard/command/research.py
@@ -9,7 +9,6 @@ def main(argv, baton):
     options, show = parse_args(argv, baton)
     appname = show[0]
     application = app.applications()[appname]
-    sh = shell.Shell()
     deploys = deploy.parse_install_lines(show, options.versions_path)
     stats = {}
     iffy = 0
@@ -28,7 +27,7 @@ def main(argv, baton):
                 d.verifyConfigured()
                 with util.ChangeDirectory(d.location):
                     results = []
-                    out = sh.safeCall('git', 'diff', '--numstat', d.app_version.scripts_tag, strip=True)
+                    out = shell.safeCall('git', 'diff', '--numstat', d.app_version.scripts_tag, strip=True)
                     total += 1
                     for line in out.split("\n"):
                         added, deleted, filename = line.split(None, 3)