Issue 1992 - createNightlies.py incorrectly determines repository name if repository path ends with…

sitescripts/extensions/utils.py

Index: sitescripts/extensions/utils.py
===================================================================
--- a/sitescripts/extensions/utils.py
+++ b/sitescripts/extensions/utils.py
@@ -213,17 +213,17 @@ class Configuration(object):
 
     return parser
 
   @property
   def basename(self):
     metadata = self.readMetadata()
     if metadata:
       return metadata.get('general', 'basename')
-    return os.path.basename(self.repository)
+    return os.path.basename(self.repository) or os.path.basename(os.path.dirname(self.repository))

[Sebastian Noack, 2015/02/13 10:47:15]

How about using normpath?

os.path.basename(os.path.normpath(self.repository))

It's less code and removes an arbitrary number of trailing slashes.

[Wladimir Palant, 2015/02/13 16:45:10]

os.path.dirname() also removes an arbitrary number of trailing slashes but using
os.path.normpath() seems to make sense indeed.

 
   def getDownloads(self):
     prefix = self.basename + '-'
     command = ['hg', 'locate', '-R', self.downloadsRepo, '-r', 'default']
 
     for filename in subprocess.check_output(command).splitlines():
       if filename.startswith(prefix) and filename.endswith(self.packageSuffix):
         yield (filename, filename[len(prefix):len(filename) - len(self.packageSuffix)])