Rename "stg assimilate" to "stg repair"

[stgit] / stgit / run.py

diff --git a/stgit/run.py b/stgit/run.py
index 7986f3b04e33d2d24d420eda7e7d88b1932e54d2..83bf5f5f356f5ae92dd1b183d57e5fbeac94db5d 100644 (file)
--- a/stgit/run.py
+++ b/stgit/run.py
@@ -19,9 +19,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 import datetime, os, subprocess
 
 
 import datetime, os, subprocess
 

-from  stgit.out import *
+from stgit.exception import *
+from stgit.out import *

 
 

-class RunException(Exception):
+class RunException(StgException):

     """Thrown when something bad happened when we tried to run the
     subprocess."""
     pass
     """Thrown when something bad happened when we tried to run the
     subprocess."""
     pass


@@ -39,7 +40,7 @@ class Run:
         self.__cmd = list(cmd)
         for c in cmd:
             if type(c) != str:
         self.__cmd = list(cmd)
         for c in cmd:
             if type(c) != str:

-                raise Exception, 'Bad command: %r' % cmd
+                raise Exception, 'Bad command: %r' % (cmd,)

         self.__good_retvals = [0]
         self.__env = None
         self.__indata = None
         self.__good_retvals = [0]
         self.__env = None
         self.__indata = None