[Pkg-xen-changes] r853 - trunk/xen/debian/bin

[Bastian Blank]

Author: waldi
Date: Sun Mar 27 20:08:23 2011
New Revision: 853

Log:
debian/bin/genorig.py
- Cleanup some definitions.
- Use subprocess.check_call.

Modified:
   trunk/xen/debian/bin/genorig.py

Modified: trunk/xen/debian/bin/genorig.py
==============================================================================
--- trunk/xen/debian/bin/genorig.py	Sun Mar 27 19:38:49 2011	(r852)
+++ trunk/xen/debian/bin/genorig.py	Sun Mar 27 20:08:23 2011	(r853)
@@ -50,30 +50,23 @@
     def do_archive(self):
         self.log("Create archive.\n")
 
-        arg_dir = os.path.join(os.path.realpath(self.temp_dir), self.orig_dir)
-        args = ('hg', 'archive', '-r', self.options.tag, arg_dir)
-        p = subprocess.Popen(args, cwd=self.repo)
-        if p.wait():
-            raise RuntimeError
+        orig_dir = os.path.join(self.temp_dir, self.orig_dir)
+        args = ('hg', 'archive', '-r', self.options.tag, os.path.realpath(orig_dir))
+        subprocess.check_call(args, cwd=self.repo)
 
     def do_changelog(self):
         self.log("Exporting changelog.\n")
 
-        log = open("%s/%s/Changelog" % (self.temp_dir, self.orig_dir), 'w')
+        log = open(os.path.join(self.temp_dir, self.orig_dir, 'Changelog'), 'w')
         args = ('hg', 'log', '-r', '%s:0' % self.options.tag)
-        p = subprocess.Popen(args, cwd=self.repo, stdout=log)
-        if p.wait():
-            raise RuntimeError
-
+        subprocess.check_call(args, cwd=self.repo, stdout=log)
         log.close()
 
     def do_tar(self):
         out = "../orig/%s" % self.orig_tar
         self.log("Generate tarball %s\n" % out)
 
-        p = subprocess.Popen(('tar', '-C', self.temp_dir, '-czf', out, self.orig_dir))
-        if p.wait():
-            raise RuntimeError
+        subprocess.check_call(('tar', '-C', self.temp_dir, '-czf', out, self.orig_dir))
 
 
 if __name__ == '__main__':