[jhbuild] Package: Fix assertion in DESTDIR handling



commit 6b2b11d98bf4ed86ad28ebd866610a7aeceeeb03
Author: Colin Walters <walters verbum org>
Date:   Wed Aug 10 04:58:41 2011 -0400

    Package: Fix assertion in DESTDIR handling
    
    It's allowable for the top_builddir to not be in the prefix.

 jhbuild/modtypes/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 4ee63d3..824d152 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -275,7 +275,7 @@ them into the prefix."""
 
         if save_broken_tree:
             if os.path.exists(broken_name):
-                assert broken_name.startswith(buildscript.config.prefix)
+                assert broken_name.startswith(buildscript.config.top_builddir)
                 shutil.rmtree(broken_name)
             os.rename(destdir, broken_name)
         else:



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