Make sure subprocess calls don`t ignore result codes indicating errors. Fix JS docs generation whil…

sitescripts/extensions/bin/updateDownloadLinks.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 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 93 matching lines @@
   """
   url = repo.downloadsURL
 
   highestURL = None
   highestVersion = None
   prefix = os.path.basename(repo.repository) + '-'
   suffix = repo.packageSuffix
 
   # go through the downloads repository looking for downloads matching this extension
   command = ['hg', 'locate', '-R', repo.downloadsRepo, '-r', 'default']
-  result, dummy = subprocess.Popen(command, stdout=subprocess.PIPE).communicate()
+  result = subprocess.check_output(command)
   for fileName in result.splitlines():
     if fileName.startswith(prefix) and fileName.endswith(suffix):
       version = fileName[len(prefix):len(fileName) - len(suffix)]
       if highestVersion == None or compareVersions(version, highestVersion) > 0:
         highestURL = urlparse.urljoin(url, fileName)
         highestVersion = version
   return (highestURL, highestVersion)
 
 def getDownloadLink(repo):
   """
@@ skipping 45 matching lines @@
     if qrcode != None:
       result.set(repo.repositoryName, "qrcode", qrcode)
 
 def readMetadata(repo, version):
   """
   reads extension ID and compatibility information from metadata file in the
   extension's repository
   """
   if repo.type == 'android':
     command = ['hg', '-R', repo.repository, 'id', '-r', version, '-n']
-    (result, dummy) = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+    result = subprocess.check_output(command)
     revision = re.sub(r'\D', '', result)
 
     command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, 'AndroidManifest.xml')]
-    (result, dummy) = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+    result = subprocess.check_output(command)
     manifest = dom.parseString(result)
     usesSdk = manifest.getElementsByTagName('uses-sdk')[0]
 
     return {
       'revision': revision,
       'minSdkVersion': usesSdk.attributes["android:minSdkVersion"].value,
     }
   else:
-    command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, 'metadata.%s' % repo.type)]
-    (result, dummy) = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-
-    # Fall back to platform-independent metadata file for now
-    if not result:
+    try:
+      command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, 'metadata.%s' % repo.type)]
+      result = subprocess.check_output(command)
+    except:

[Sebastian Noack, 2013/07/04 13:57:51]

It would be better to check whether the platform-specific metadata file exists
instead of catching every possible exception. There might be other reasons why
the command fails, and I would rather not silently ignore them.

+      # Fall back to platform-independent metadata file for now
       command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, 'metadata')]
-      (result, dummy) = subprocess.Popen(command, stdout=subprocess.PIPE).communicate()
+      result = subprocess.check_output(command)
 
     parser = SafeConfigParser()
     parser.readfp(StringIO(result))
 
     result = {
       'extensionID': parser.get('general', 'id'),
       'version': version,
       'compat': []
     }
     for key, value in KNOWN_APPS.iteritems():
@@ skipping 32 matching lines @@
   result = SafeConfigParser()
   getDownloadLinks(result)
   file = open(get_config().get('extensions', 'downloadLinksFile'), 'wb')
   result.write(file)
   file.close()
 
   writeUpdateManifest(result)
 
 if __name__ == "__main__":
   updateLinks()