Issue 4653 - Add handling for bookmarks to readMetadata

sitescripts/extensions/utils.py

Index: sitescripts/extensions/utils.py
===================================================================
--- a/sitescripts/extensions/utils.py
+++ b/sitescripts/extensions/utils.py
@@ -202,17 +202,17 @@
         result = subprocess.check_output(command)
 
         parser = SafeConfigParser()
         parser.readfp(StringIO(result))
 
         return parser
 
     def getDownloads(self):
-        metadata = self.readMetadata()
+        metadata = self.readMetadata(self.revision)

[Sebastian Noack, 2016/11/25 13:01:56]

I think this logic belongs into readMetadata(), so that when no arguments are
supplied that it uses self.revision by default. Now, where we have that value,
it seems more expected that it is used by default rather than tip.

[Jon Sonesen, 2016/11/25 13:05:01]

I agree here.

[Sebastian Noack, 2016/11/25 13:40:29]

For reference, we discussed that a little more on IRC, and as it turned out that
there is no place left where readMetadata() is called without argument, we
decided to leave the code here as is, but make the argument mandatory.

         if metadata:
             prefix = metadata.get('general', 'basename')
         else:
             prefix = os.path.basename(os.path.normpath(self.repository))
         prefix += '-'
 
         command = ['hg', 'locate', '-R', self.downloadsRepo, '-r', 'default']
         for filename in subprocess.check_output(command).splitlines():
@@ -311,16 +311,19 @@
 def getDownloadLinks(result):
     """
     gets the download links for all extensions and puts them into the config
     object
     """
     for repo in Configuration.getRepositoryConfigurations():
         try:
             (downloadURL, version) = _getDownloadLink(repo)
+            if downloadURL is None:
+                message = 'No download link found for repo: ' + repo

[Sebastian Noack, 2016/11/25 13:01:56]

Any reason you don't pass the message directly to the Exception() constructor,
but assign it to a variable first?

[Jon Sonesen, 2016/11/25 13:05:01]

I had it in an if statement when i was testing it and forgot to change it, will
pass the message directly

+                raise Exception(message)
         except:
             traceback.print_exc()
             continue
         if not result.has_section(repo.repositoryName):
             result.add_section(repo.repositoryName)
         result.set(repo.repositoryName, 'downloadURL', downloadURL)
         result.set(repo.repositoryName, 'version', version)