Some minor tweaks and fixes

2 files changed, 11 insertions, 9 deletions

diff --git a/modules/darcs.py b/modules/darcs.py
index 7735e45..0921d3c 100644
--- a/modules/darcs.py
+++ b/modules/darcs.py
@@ -141,7 +141,7 @@ class Darcs(RevisionControl):
                               stdout=darcs_out, stderr=darcs_out)
                     log.info('generating tarball %s.tar.gz, please wait...'
                              % full_name)
-                    p.wait()
+                    p.communicate()
             sourceball = full_name + '.tar.gz'
             move(join(self.source_dir(), sourceball), sourceball)
             self.cfg['sourceball'] = sourceball
diff --git a/modules/mock.py b/modules/mock.py
index aaa0108..e15a063 100644
--- a/modules/mock.py
+++ b/modules/mock.py
@@ -22,7 +22,7 @@ from subprocess import Popen
 from base.base import log
 from base.module import Module
 from base.profiles import ver_rel
-from base.util import pwd
+from base.util import pwd, log_file
 
 from modules.build import Build
 from modules.dirfactory import DirFactory
@@ -44,17 +44,19 @@ class Mock(Module):
         mock_cfg = self.profile.mock_cfg
         result_dir = self.profile.result_dir
         config_dir = self.profile.mock_cfg_dir
-        cmd = ['mock', '-r %s' % mock_cfg,
+        log.debug('mock_cfg is ' + mock_cfg)
+        log.debug('result_dir is ' + result_dir)
+        log.debug('config_dir is ' + config_dir)
+        cmd = ['mock', '-r', mock_cfg,
                '--configdir=%s' % config_dir,
                '--resultdir=%s' % result_dir, 
                srpm_name]
         log.debug('cmd is ' + str(cmd))
-        with pwd(pkg.dir):
-            with file('mock.log', 'w') as mock_out:
-                with pwd(result_dir):
-                    p = Popen(cmd, stdout=mock_out, stderr=mock_out)
-                    log.info('mock compiling %s... please wait' % srpm_name)
-                    p.wait()
+        with pwd(result_dir):
+            with log_file('mock.log') as mock_out:
+                p = Popen(cmd, stdout=mock_out, stderr=mock_out)
+                log.info('mock compiling %s... please wait' % srpm_name)
+                p.communicate()
 
     def close(self):
         self.build.close()