Merge remote-tracking branch 'origin/master' into description-md5

Conflicts:
	dak/update_db.py

diff --combined dak/update_db.py
index 3df0b43bd23ecf47bb33d9e7dc13174e32074d75,e3dd06251cb65eedc7499fa9cdae227451428e62..e9426ff5a584a3d1a0cf1263f222f27a05dc2ad7
--- 1/dak/update_db.py
--- 2/dak/update_db.py
+++ b/dak/update_db.py
@@@ -46,7 -46,7 +46,7 @@@ from daklib.daklog import Logge
  ################################################################################
  
  Cnf = None
 -required_database_schema = 68
 +required_database_schema = 69
  
  ################################################################################
  
@@@ -134,7 -134,7 +134,7 @@@ Updates dak's database schema to the la
  
              self.db = psycopg2.connect(connect_str)
  
-         except Exception, e:
+         except Exception as e:
              print "FATAL: Failed connect to database (%s)" % str(e)
              sys.exit(1)
  
@@@ -171,7 -171,7 +171,7 @@@
                  message = "updated database schema from %d to %d" % (database_revision, i+1)
                  print message
                  logger.log([message])
-             except DBUpdateError, e:
+             except DBUpdateError as e:
                  # Seems the update did not work.
                  print "Was unable to update database schema from %d to %d." % (database_revision, i+1)
                  print "The error message received was %s" % (e)
@@@ -205,7 -205,7 +205,7 @@@
                  fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
              else:
                  utils.warn("Lock directory doesn't exist yet - not locking")
-         except IOError, e:
+         except IOError as e:
              if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':
                  utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")
  

diff --combined daklib/filewriter.py
index d26636dc347a36510d1d21223e8a602a1320199b,274ef5c12dadc8b6ab6a921c9680770f1628b48c..8e17efdfcbeac574997f1c5c9288d7a84aa8ac9b
--- 1/daklib/filewriter.py
--- 2/daklib/filewriter.py
+++ b/daklib/filewriter.py
@@@ -65,7 -65,7 +65,7 @@@ class BaseFileWriter(object)
      # internal helper function
      def rename(self, filename):
          tempfilename = filename + '.new'
-         os.chmod(tempfilename, 0664)
+         os.chmod(tempfilename, 0o664)
          os.rename(tempfilename, filename)
  
      def close(self):
@@@ -151,19 -151,3 +151,19 @@@ class SourcesFileWriter(BaseFileWriter)
          flags.update(keywords)
          template = "dists/%(suite)s/%(component)s/source/Sources"
          BaseFileWriter.__init__(self, template, **flags)
 +
 +class TranslationFileWriter(BaseFileWriter):
 +    def __init__(self, **keywords):
 +        '''
 +        The value of the keywords suite, component and language are strings.
 +        Output files are bzip2 compressed only.
 +        '''
 +        flags = {
 +            'uncompressed': False,
 +            'gzip':         False,
 +            'bzip2':        True,
 +            'language':     'en',
 +        }
 +        flags.update(keywords)
 +        template = "dists/%(suite)s/%(component)s/i18n/Translation-%(language)s"
 +        super(TranslationFileWriter, self).__init__(template, **flags)