[jhbuild] Error if prefix, buildroot, ... not absolute paths (GNOME bug 672974)



commit b0f8fcfecdec1f4c04336a0ec948f0b06e780339
Author: Craig Keogh <cskeogh adam com au>
Date:   Wed Apr 18 10:51:35 2012 +0930

    Error if prefix, buildroot, ... not absolute paths (GNOME bug 672974)
    
    Error if buildroot, checkoutroot, prefix, tarballdir,
    tinderbox_outputdir config are not absolute paths

 jhbuild/config.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 9abbe16..65eee5d 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -19,6 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import os
+import os.path
 import re
 import sys
 import traceback
@@ -308,6 +309,19 @@ class Config:
                 self.use_local_modulesets = False
             self.modulesets_dir = None
 
+        if self.buildroot and not os.path.isabs(self.buildroot):
+            raise FatalError(_('%s must be an absolute path') % 'buildroot')
+        if not os.path.isabs(self.checkoutroot):
+            raise FatalError(_('%s must be an absolute path') % 'checkoutroot')
+        if not os.path.isabs(self.prefix):
+            raise FatalError(_('%s must be an absolute path') % 'prefix')
+        if not os.path.isabs(self.tarballdir):
+            raise FatalError(_('%s must be an absolute path') % 'tarballdir')
+        if (self.tinderbox_outputdir and
+            not os.path.isabs(self.tinderbox_outputdir)):
+            raise FatalError(_('%s must be an absolute path') %
+                             'tinderbox_outputdir')
+
     def get_original_environment(self):
         return self._orig_environ
 



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