Mercurial > gub

changeset 5433:9d2d54820803

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
settings: also remove // from gubdir-based directories.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 27 Jul 2009 12:38:01 +0200
parents fd1c309023d4
children 623bee47d9e5
files gub/settings.py
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/settings.py	Mon Jul 27 12:33:33 2009 +0200
+++ b/gub/settings.py	Mon Jul 27 12:38:01 2009 +0200
@@ -109,6 +109,8 @@
         self.gubdir = os.path.abspath (os.path.dirname (os.path.dirname (__file__)))
         if not self.gubdir:
             self.gubdir = os.getcwd ()
+        if self.gubkdir_prefix.endswith ('/'):
+            self.gubdir_prefix = self.gubdir_prefix[:-1]
 
         # workdir is top of writable build stuff
         self.workdir = os.getcwd ()
@@ -117,10 +119,10 @@
             self.workdir_prefix = self.workdir_prefix[:-1]
         
         # gubdir based: fixed repository layout
-        self.patchdir = self.gubdir + '/patches'
-        self.sourcefiledir = self.gubdir + '/sourcefiles'
-        self.specdir = self.gubdir + '/gub/specs'
-        self.nsisdir = self.gubdir + '/nsis'
+        self.patchdir = self.gubdir_prefix + '/patches'
+        self.sourcefiledir = self.gubdir_prefix + '/sourcefiles'
+        self.specdir = self.gubdir_prefix + '/gub/specs'
+        self.nsisdir = self.gubdir_prefix + '/nsis'
 
         # workdir based; may be changed
         self.downloads = self.workdir_prefix + '/downloads'