Fix branch/checkout issue

diff --git a/gitbuildsys/buildservice.py b/gitbuildsys/buildservice.py
index 9ce7cd6e209f4ca82e88321ea26fe32aabe5c1ae..c32fb59b9cb240b99e04172eaf03089726bfc56e 100644 (file)
--- a/gitbuildsys/buildservice.py
+++ b/gitbuildsys/buildservice.py
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import os
+import shutil
 import tempfile
 import time
 import urlparse
@@ -1080,14 +1081,12 @@ class BuildService(object):
         """Create empty package for new one under CWD
         """
 
-        import shutil
-        shutil.rmtree(prj, ignore_errors = True)
-
         core.make_dir(self.apiurl, prj, pkg, pathname = '.')
 
         pkg_path = os.path.join(prj, pkg)
         shutil.rmtree(pkg_path, ignore_errors = True)
-        core.createPackageDir(pkg_path)
+        os.chdir(prj)
+        core.createPackageDir(pkg)
 
     def submit(self, msg, wd='.'):
         if not core.is_package_dir(wd):

diff --git a/gitbuildsys/obspkg.py b/gitbuildsys/obspkg.py
index 9c996ae4ac887c796904f28ad4fc34fd95f59ab2..dadeccc90181601f8f5178d26777bcde908c7a02 100644 (file)
--- a/gitbuildsys/obspkg.py
+++ b/gitbuildsys/obspkg.py
@@ -18,6 +18,7 @@
 
 from __future__ import with_statement
 import os
+import shutil
 import buildservice
 import runner
 import msger
@@ -68,6 +69,9 @@ class ObsPackage(object):
         if not os.path.exists(self._bdir):
             os.makedirs(self._bdir)
 
+        with _Workdir(self._bdir):
+            shutil.rmtree(prj, ignore_errors = True)
+
         if self._bs.isNewPackage(prj, pkg):
             # to init new package in local dir
             self._mkpac()