From 27396638ba0d4a8795643cdfb75b91a490e7b29a Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 19 Jun 2011 11:40:43 +0100
Subject: Use cliapp's runcmd instead of our own.

---
 unperish | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/unperish b/unperish
index a2ad172..7e260cb 100755
--- a/unperish
+++ b/unperish
@@ -136,17 +136,17 @@ class Unperish(cliapp.Application):
         if not self.settings['dsc']:
             raise cliapp.AppException('Need --dsc option for dget')
         
-        self.runcmd('dget', '--download-only', self.settings['dsc'],
+        self.runcmd(['dget', '--download-only', self.settings['dsc']],
                     cwd=self.settings['build-area'])
 
     def cmd_export(self, args):
         '''Export unpacked source directory to build area.'''
-        self.runcmd('bzr', 'export', self.join(self.dirname))
+        self.runcmd(['bzr', 'export', self.join(self.dirname)])
 
     def cmd_debian_tarball(self, args):
         '''Generate Debian tarball (.orig.tar.gz) in build area.'''
         origtar = self.join(self.debian_tarball)
-        self.runcmd('bzr', 'export', origtar)
+        self.runcmd(['bzr', 'export', origtar])
 
     def cmd_dch(self, args):
         '''Add a debian/changelog entry for new upload target.'''
@@ -155,7 +155,7 @@ class Unperish(cliapp.Application):
 
     def cmd_dsc(self, args):
         '''Create Debian source package (.dsc) in build area.'''
-        self.runcmd('dpkg-source', '-b', self.dirname, 
+        self.runcmd(['dpkg-source', '-b', self.dirname], 
                     cwd=self.settings['build-area'])
 
     def cmd_deb(self, args):
@@ -170,7 +170,7 @@ class Unperish(cliapp.Application):
                 '--logfile', self.join('pbuilder.log'),
                 '--debbuildopts', '-sa',
                 dsc]
-        self.runcmd(*argv, cwd=self.settings['build-area'])
+        self.runcmd(argv, cwd=self.settings['build-area'])
 
     def cmd_clean(self, args):
         '''Clean up the build-area (remove everything except the dir).'''
@@ -185,11 +185,11 @@ class Unperish(cliapp.Application):
 
     def add_debian_changelog_entry(self):
         target = self.settings['upload-target']
-        self.runcmd('dch', 
-                    '--force-distribution',
-                    '--local', target,
-                    '--distribution', target,
-                    'Build for %s.' % target,
+        self.runcmd(['dch', 
+                     '--force-distribution',
+                     '--local', target,
+                     '--distribution', target,
+                     'Build for %s.' % target],
                     cwd=self.join(self.dirname))
 
     def create_meta(self):
@@ -201,11 +201,11 @@ class Unperish(cliapp.Application):
 
     def autofill_meta(self):
         if os.path.exists('setup.py'):
-            name = self.runcmd('python', 'setup.py', '--name').strip()
+            name = self.runcmd(['python', 'setup.py', '--name']).strip()
             if name:
                 self.meta.set('project', 'name', name)
 
-            version = self.runcmd('python', 'setup.py', '--version').strip()
+            version = self.runcmd(['python', 'setup.py', '--version']).strip()
             if version:
                 self.meta.set('project', 'version', version)
 
@@ -216,18 +216,11 @@ class Unperish(cliapp.Application):
         components = (self.settings['build-area'],) + components
         return os.path.join(*components)
 
-    def runcmd(self, *argv, **kwargs):
+    def runcmd(self, argv, *args, **kwargs):
         logging.debug('runcmd: %s' % repr(argv))
         if self.settings['verbose']:
             self.output.write('run: %s\n' % ' '.join(argv))
-        p = subprocess.Popen(argv, 
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE, 
-                             **kwargs)
-        out, err = p.communicate()
-        if p.returncode:
-            raise cliapp.AppException('command failed: %s\n%s' % (argv, err))
-        return out
+        return cliapp.Application.runcmd(argv, *args, **kwargs)
 
 
 if __name__ == '__main__':
-- 
cgit v1.2.1