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

sitescripts/extensions/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 200 matching lines @@
     parser = SafeConfigParser()
     parser.readfp(StringIO(result))
 
     return parser
 
   @property
   def basename(self):
     metadata = self.readMetadata()
     if metadata:
       return metadata.get('general', 'basename')
-    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.

+    return os.path.basename(os.path.normpath(self.repository))
 
   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)])
 
   @staticmethod
@@ skipping 212 matching lines @@
   if not extensions:
     return
 
   updates = {}
   for extension in extensions:
     updates[extension['basename']] = {
       "url": extension['updateURL'],
       "version": extension['version']
     }
   writeLibabpUpdateManifest(path, updates)