From: Joerg Jaspert Date: Wed, 24 Sep 2008 21:34:23 +0000 (+0200) Subject: Merge commit 'sec-merge' into security X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7f20bb168b919452f8ee0c865ab91f0084a9f46a;hp=-c;p=dak.git Merge commit 'sec-merge' into security * commit 'sec-merge': cater for uid_email None in sponsor notification Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Use "import daklib.foo as foo" style Signed-off-by: Joerg Jaspert --- 7f20bb168b919452f8ee0c865ab91f0084a9f46a diff --combined ChangeLog index 833a64bf,eead3da3..05a17bc5 --- a/ChangeLog +++ b/ChangeLog @@@ -1,5 -1,8 +1,8 @@@ 2008-05-04 Joerg Jaspert + * dak/import_keyring.py: Remove unused daklib.logging and Logger + and add the actually used daklib/utils + * dak/examine_package.py: remove daklib.queue import, never used * dak/check_proposed_updates.py: Import stuff from daklib as @@@ -14,6 -17,24 +17,24 @@@ * dak/generate_index_diffs.py: likewise * dak/generate_releases.py: likewise * dak/import_archive.py: likewise + * dak/import_ldap_fingerprints.py: likewise + * dak/import_users_from_passwd.py: likewise + * dak/init_db.py: likewise + * dak/init_dirs.py: likewise + * dak/ls.py: likewise + * dak/make_maintainers.py: likewise + * dak/make_overrides.py: likewise + * dak/make_suite_file_list.py: likewise + * dak/new_security_install.py: likewise + * dak/override.py: likewise + * dak/process_accepted.py: likewise + * dak/process_new.py: likewise + * dak/process_unchecked.py: likewise + * dak/rm.py: likewise + * dak/show_new.py: likewise + * dak/split_done.py: likewise + * dak/stats.py: likewise + * dak/transitions.py: likewise * dak/check_archive.py (check_files_not_symlinks): Remove long-time unused and commented code. Import stuff from daklib as @@@ -49,7 -70,6 +70,7 @@@ * dak/stats.py: likewise * dak/symlink_dists.py: likewise * dak/transitions.py: likewise +>>>>>>> sec-merge:ChangeLog 2008-05-03 Joerg Jaspert