Merge remote branch 'ftpmaster/master' into psimport

Conflicts:
	daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --cc daklib/dbconn.py
index 79e0621bbc302680624fa5261eadc2eab5d32e1e,6782c081145944e57c22a1bf718872e00c7106c9..4d30e663b994fee443f87aa120dbca0fb9bc1a03
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -2191,20 -2176,8 +2195,22 @@@ class DBSource(ORMObject)
          return ['source', 'version', 'install_date', 'maintainer', \
              'changedby', 'poolfile', 'install_date']
  
 +    def read_control(self):
 +        '''
 +        Reads the control information from a dsc
 +
 +        @rtype: tuple
 +        @return: (stanza, controldict)  stanza is the text of the control
 +                 section.  controldict is the information in a dictionary
 +                 form
 +        '''
 +        from debian.debfile import Deb822
 +        fullpath = self.poolfile.fullpath
 +        fields = Deb822(open(self.poolfile.fullpath, 'r'))
 +        return fields
 +
+     metadata = association_proxy('key', 'value')
+ 
  __all__.append('DBSource')
  
  @session_wrapper