[jhbuild] Revert "bot: Move packagedb only if top_builddir exists (it doesn't on build masters)"



commit 464f9d1cc05f8b7b699b811479199e0713467fc2
Author: Colin Walters <walters verbum org>
Date:   Sat Jul 30 13:13:42 2011 -0400

    Revert "bot: Move packagedb only if top_builddir exists (it doesn't on build masters)"
    
    This reverts commit cbbea64ac930b48945c63723b54e98a3b48b1512.
    
    We don't need this commit; 6c485ba8 contained a different and better
    fix.
    
    Conflicts:
    
    	jhbuild/moduleset.py
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655114

 jhbuild/moduleset.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index ed7e617..2751e9f 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -56,9 +56,8 @@ class ModuleSet:
         if db is None:
             legacy_pkgdb_path = os.path.join(self.config.prefix, 'share', 'jhbuild', 'packagedb.xml')
             new_pkgdb_path = os.path.join(self.config.top_builddir, 'packagedb.xml')
-            if os.path.exists(self.config.top_builddir) and os.path.isfile(legacy_pkgdb_path):
+            if os.path.isfile(legacy_pkgdb_path):
                 os.rename(legacy_pkgdb_path, new_pkgdb_path)
-
             self.packagedb = packagedb.PackageDB(new_pkgdb_path, config)
         else:
             self.packagedb = db



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]