[POS-commit] r3339 - in kiwi/trunk: .

[Johan Dahlin]

Author: jdahlin
Date: Wed Apr 26 09:20:00 2006
New Revision: 3339

Modified:
   kiwi/trunk/ChangeLog
   kiwi/trunk/kiwi/dist.py

Log:
	* kiwi/dist.py (_VariableExtender.__init__): When prefix is not
	set, use sys.prefix instead.



Modified: kiwi/trunk/ChangeLog
==============================================================================
--- kiwi/trunk/ChangeLog	(original)
+++ kiwi/trunk/ChangeLog	Wed Apr 26 09:20:00 2006
@@ -1,3 +1,8 @@
+2006-04-26  Johan Dahlin  <johan at gnome.org>
+
+	* kiwi/dist.py (_VariableExtender.__init__): When prefix is not
+	set, use sys.prefix instead.
+
 2006-04-25  Ronaldo Maia  <romaia at async.com.br>
 
 	reviewed by: jdahlin

Modified: kiwi/trunk/kiwi/dist.py
==============================================================================
--- kiwi/trunk/kiwi/dist.py	(original)
+++ kiwi/trunk/kiwi/dist.py	Wed Apr 26 09:20:00 2006
@@ -40,6 +40,9 @@
         name = distribution.get_name()
         # Remove trailing /
         prefix = install.prefix
+        if not prefix:
+            prefix = sys.prefix
+
         if prefix[-1] == '/':
             prefix = prefix[:-1]
         self.prefix = prefix
@@ -66,7 +69,7 @@
             prefix = 'import sys\nprefix = sys.prefix'
         else:
             install = self.distribution.get_command_obj('install')
-            prefix = 'prefix = "%s"' % install.prefix
+            prefix = 'prefix = "%s"' % install.prefix or sys.prefix
 
         name = self.distribution.get_name()
         filename = os.path.join(self.install_dir, name, '__installed__.py')