From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 23 Apr 2008 23:22:36 +0000 (+0200)
Subject: Merge from Thomas
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=ebc80c6941140d9d81a18069d45097478c8d1c60;hp=-c

Merge from Thomas
---

ebc80c6941140d9d81a18069d45097478c8d1c60
diff --combined ChangeLog
index 4f72b591,76f68664..8aef43b7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,11 +1,11 @@@
+ 2008-04-23  Thomas Viehmann  <tviehmann@ries.debian.org>
+ 
+ 	* dak/process_unchecked.py: add changes["sponsoremail"]
+ 	  for sponsored uploads if desired
+ 	* daklib/utils.py: add functions
+ 	  is_email_alias to check which accounts allow email forwarding and
+ 	  which_alias_file to find the alias file
+ 
  2008-04-22  Joerg Jaspert  <joerg@debian.org>
  
  	* setup/init_pool.sql: added a function/aggregate for the release
@@@ -12,7 -20,7 +20,7 @@@
  	dumps, using a scheme to keep more of the recent dumps.
  
  	* config/debian/cron.daily: Use the new script. Also - compress
--	all files older than 7 days, instead of 30. 
++	all files older than 7 days, instead of 30.
  
  	* dak/process_accepted.py (install): Do not break if a
  	source/maintainer combination is already in src_uploaders, "just"
@@@ -143,20 -151,6 +151,20 @@@
  	changes[architecture] has source included.
  	(check_transition): Now call the database.get_testing_version
  
 +2008-02-09  Christoph Berg <myon@debian.org>
 +
 +	* daklib/queue.py (get_type): fubar does not exist in global
 +	namespace.
 +
 +	* setup/add_constraints.sql setup/init_pool.sql: Add changedby column
 +	to source table, and move src_uploaders after source so the REFERNCES
 +	clause works.
 +	* dak/process_accepted.py (install): Fill the changedby column from
 +	the information found in the .changes. This will allow to identify
 +	NMUs and sponsored uploads more precisely in tools querying projectb.
 +	* scripts/debian/insert_missing_changedby.py: Script to import yet
 +	missing fields from filippo's uploads-history DB.
 +
  2008-02-06  Joerg Jaspert  <joerg@debian.org>
  
  	* daklib/utils.py (check_signature): Make variable key available,
diff --combined daklib/queue.py
index 9fac0cc0,7b3aba09..a5a8eab4
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@@ -106,12 -106,12 +106,12 @@@ def get_type(f)
      elif f["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2", "dsc" ]:
          type = "dsc"
      else:
 -        fubar("invalid type (%s) for new.  Dazed, confused and sure as heck not continuing." % (type))
 +        utils.fubar("invalid type (%s) for new.  Dazed, confused and sure as heck not continuing." % (type))
  
      # Validate the override type
      type_id = database.get_override_type_id(type)
      if type_id == -1:
 -        fubar("invalid type (%s) for new.  Say wha?" % (type))
 +        utils.fubar("invalid type (%s) for new.  Say wha?" % (type))
  
      return type
  
@@@ -279,6 -279,8 +279,8 @@@ class Upload
              Subst["__MAINTAINER_FROM__"] = changes["changedby2047"]
              Subst["__MAINTAINER_TO__"] = "%s, %s" % (changes["changedby2047"],
                                                       changes["maintainer2047"])
+             if "sponsoremail" in changes:
+                 Subst["__MAINTAINER_TO__"] += ", %s"%changes["sponsoremail"]
              Subst["__MAINTAINER__"] = changes.get("changed-by", "Unknown")
          else:
              Subst["__MAINTAINER_FROM__"] = changes["maintainer2047"]