From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 24 Sep 2008 21:22:16 +0000 (+0200)
Subject: Merge commit 'sec-merge' into security
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b07852aa10727e959844a3f3b4d5b8a6bce00dbf;p=dak.git

Merge commit 'sec-merge' into security

* commit 'sec-merge': (29 commits)
  Cleanup
  Cleanup
  Cleanup in check_archives
  pychecker cleanup
  "Fake" a changelog entry for Mark
  Do not allow o-p-u-new to break dinstall
  WTF? rm -f ? WTF?
  Revert examine_package.py, which was broken
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  clean up pychecker warnings
  fix the simpler of the pychecker errors
  ...

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

b07852aa10727e959844a3f3b4d5b8a6bce00dbf
diff --cc ChangeLog
index 6f67b2e2,b5c129b0..e515fc65
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,40 +1,46 @@@
+ 2008-05-04  Joerg Jaspert  <joerg@debian.org>
+ 
+ 	* dak/check_proposed_updates.py: Import stuff from daklib as
+ 	"import daklib.foo as foo"
+ 	* dak/clean_proposed_updates.py: likewise
+ 	* dak/clean_queues.py: likewise
+ 
+ 	* dak/check_archive.py (check_files_not_symlinks): Remove
+ 	long-time unused and commented code. Import stuff from daklib as
+ 	"import daklib.foo as foo"
+ 
 +2008-05-04  Thomas Viehmann  <tv@beamnet.de>
 +
 +	* dak/process_unchecked.py (check_signed_by_key): cater for uid_email
 +	None in sponsor notification
 +
+ 2008-05-03  Joerg Jaspert  <joerg@debian.org>
+ 
+ 	* dak/examine_package.py: clean up pychecker warnings (merged with
+ 	Thomas changes to the NEW display)
+ 
+ 2008-05-03  Mark Hymers <mhy@debian.org>
+ 
+ 	* dak/check_archive.py: clean up pychecker warnings
+ 	* dak/check_overrides.py: likewise
+ 	* dak/check_proposed_updates.py: likewise
+ 	* dak/clean_proposed_updates.py: likewise
+ 	* dak/clean_queues.py: likewise
+ 	* dak/control_overrides.py: likewise
+ 	* dak/control_suite.py: likewise
+ 	* dak/decode_dot_dak.py: likewise
+ 	* dak/examine_package.py: likewise
+ 	* dak/process_new.py: likewise
+ 	* dak/process_unchecked.py: likewise
+ 	* dak/queue_report.py: likewise
+ 	* dak/reject_proposed_updates.py: likewise
+ 	* dak/security_install.py: likewise
+ 	* dak/show_new.py: likewise
+ 	* dak/stats.py: likewise
+ 	* dak/symlink_dists.py: likewise
+ 	* dak/transitions.py: likewise
++>>>>>>> sec-merge:ChangeLog
+ 
  2008-05-03  Joerg Jaspert  <joerg@debian.org>
  
  	* config/debian/cron.daily: Rename to