ftpmaster-dak r1086: Merge cleanup branch, take X
------------------------------------------------------------
revno: 1086
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Mon 2008-05-05 21:35:57 +0200
message:
Merge cleanup branch, take X
modified:
dak/check_archive.py
dak/check_overrides.py
dak/check_proposed_updates.py
dak/clean_proposed_updates.py
dak/clean_queues.py
dak/clean_suites.py
dak/compare_suites.py
dak/control_overrides.py
dak/control_suite.py
dak/cruft_report.py
dak/decode_dot_dak.py
dak/examine_package.py
dak/find_null_maintainers.py
dak/generate_index_diffs.py
dak/generate_releases.py
dak/import_archive.py
dak/import_keyring.py
dak/import_ldap_fingerprints.py
dak/import_users_from_passwd.py
dak/init_db.py
dak/init_dirs.py
dak/ls.py
dak/make_maintainers.py
dak/make_overrides.py
dak/make_suite_file_list.py
dak/new_security_install.py
dak/override.py
dak/process_accepted.py
dak/process_new.py
dak/process_unchecked.py
dak/queue_report.py
dak/reject_proposed_updates.py
dak/rm.py
dak/security_install.py
dak/show_new.py
dak/split_done.py
dak/stats.py
dak/transitions.py
------------------------------------------------------------
revno: 1082.2.2
committer: Mark Hymers <mhy@debian.org>
branch nick: cleanup-exceptions
timestamp: Mon 2008-05-05 20:32:00 +0100
message:
let's use pythonesque imports, shall we?
modified:
dak/check_archive.py
dak/check_overrides.py
dak/check_proposed_updates.py
dak/clean_proposed_updates.py
dak/clean_queues.py
dak/clean_suites.py
dak/compare_suites.py
dak/control_overrides.py
dak/control_suite.py
dak/cruft_report.py
dak/decode_dot_dak.py
dak/examine_package.py
dak/find_null_maintainers.py
dak/generate_index_diffs.py
dak/generate_releases.py
dak/import_archive.py
dak/import_keyring.py
dak/import_ldap_fingerprints.py
dak/import_users_from_passwd.py
dak/init_db.py
dak/init_dirs.py
dak/ls.py
dak/make_maintainers.py
dak/make_overrides.py
dak/make_suite_file_list.py
dak/new_security_install.py
dak/override.py
dak/process_accepted.py
dak/process_new.py
dak/process_unchecked.py
dak/queue_report.py
dak/reject_proposed_updates.py
dak/rm.py
dak/security_install.py
dak/show_new.py
dak/split_done.py
dak/stats.py
dak/transitions.py
------------------------------------------------------------
revno: 1082.2.3
committer: Mark Hymers <mhy@debian.org>
branch nick: cleanup-exceptions
timestamp: Mon 2008-05-05 20:33:02 +0100
message:
merge from mainline
modified:
ChangeLog
dak/transitions.py
daklib/dak_exceptions.py
------------------------------------------------------------
revno: 1085.1.1
committer: Joerg Jaspert <joerg@debian.org>
branch nick: cleanup
timestamp: Mon 2008-05-05 21:35:27 +0200
message:
Merge from Mark: <mhy> err yes, I don't know what I was thinking
modified:
dak/check_archive.py
dak/check_overrides.py
dak/check_proposed_updates.py
dak/clean_proposed_updates.py
dak/clean_queues.py
dak/clean_suites.py
dak/compare_suites.py
dak/control_overrides.py
dak/control_suite.py
dak/cruft_report.py
dak/decode_dot_dak.py
dak/examine_package.py
dak/find_null_maintainers.py
dak/generate_index_diffs.py
dak/generate_releases.py
dak/import_archive.py
dak/import_keyring.py
dak/import_ldap_fingerprints.py
dak/import_users_from_passwd.py
dak/init_db.py
dak/init_dirs.py
dak/ls.py
dak/make_maintainers.py
dak/make_overrides.py
dak/make_suite_file_list.py
dak/new_security_install.py
dak/override.py
dak/process_accepted.py
dak/process_new.py
dak/process_unchecked.py
dak/queue_report.py
dak/reject_proposed_updates.py
dak/rm.py
dak/security_install.py
dak/show_new.py
dak/split_done.py
dak/stats.py
dak/transitions.py
=== modified file 'dak/check_archive.py'
--- a/dak/check_archive.py 2008-05-05 12:44:31 +0000
+++ b/dak/check_archive.py 2008-05-05 19:32:00 +0000
@@ -28,8 +28,8 @@
import commands, os, pg, stat, sys, time
import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/check_overrides.py'
--- a/dak/check_overrides.py 2008-05-03 13:32:43 +0000
+++ b/dak/check_overrides.py 2008-05-05 19:32:00 +0000
@@ -50,9 +50,9 @@
import pg, sys, os
import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
################################################################################
=== modified file 'dak/check_proposed_updates.py'
--- a/dak/check_proposed_updates.py 2008-05-03 23:21:33 +0000
+++ b/dak/check_proposed_updates.py 2008-05-05 19:32:00 +0000
@@ -30,8 +30,8 @@
import pg, sys, os
import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/clean_proposed_updates.py'
--- a/dak/clean_proposed_updates.py 2008-05-03 23:23:04 +0000
+++ b/dak/clean_proposed_updates.py 2008-05-05 19:32:00 +0000
@@ -21,8 +21,8 @@
import os, pg, re, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/clean_queues.py'
--- a/dak/clean_queues.py 2008-05-03 23:23:04 +0000
+++ b/dak/clean_queues.py 2008-05-05 19:32:00 +0000
@@ -35,7 +35,7 @@
import os, stat, sys, time
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/clean_suites.py'
--- a/dak/clean_suites.py 2008-05-03 23:29:57 +0000
+++ b/dak/clean_suites.py 2008-05-05 19:32:00 +0000
@@ -30,7 +30,7 @@
import os, pg, stat, sys, time
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/compare_suites.py'
--- a/dak/compare_suites.py 2008-05-03 23:36:01 +0000
+++ b/dak/compare_suites.py 2008-05-05 19:32:00 +0000
@@ -22,8 +22,8 @@
import pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/control_overrides.py'
--- a/dak/control_overrides.py 2008-05-03 13:51:42 +0000
+++ b/dak/control_overrides.py 2008-05-05 19:32:00 +0000
@@ -51,9 +51,9 @@
import pg, sys, time
import apt_pkg
-import daklib.utils as utils
-import daklib.database as database
-import daklib.logging as logging
+from daklib import utils
+from daklib import database
+from daklib import logging
################################################################################
=== modified file 'dak/control_suite.py'
--- a/dak/control_suite.py 2008-05-03 13:56:31 +0000
+++ b/dak/control_suite.py 2008-05-05 19:32:00 +0000
@@ -43,9 +43,9 @@
import pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
#######################################################################################
=== modified file 'dak/cruft_report.py'
--- a/dak/cruft_report.py 2008-05-04 21:54:54 +0000
+++ b/dak/cruft_report.py 2008-05-05 19:32:00 +0000
@@ -29,8 +29,8 @@
import commands, pg, os, sys, time
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/decode_dot_dak.py'
--- a/dak/decode_dot_dak.py 2008-05-03 15:19:32 +0000
+++ b/dak/decode_dot_dak.py 2008-05-05 19:32:00 +0000
@@ -28,8 +28,8 @@
import sys
import apt_pkg
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import queue
+from daklib import utils
################################################################################
=== modified file 'dak/examine_package.py'
--- a/dak/examine_package.py 2008-05-03 23:50:13 +0000
+++ b/dak/examine_package.py 2008-05-05 19:32:00 +0000
@@ -34,8 +34,8 @@
import errno, os, pg, re, sys, md5
import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/find_null_maintainers.py'
--- a/dak/find_null_maintainers.py 2008-05-03 23:50:13 +0000
+++ b/dak/find_null_maintainers.py 2008-05-05 19:32:00 +0000
@@ -21,7 +21,7 @@
import ldap, pg, sys, time
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/generate_index_diffs.py'
--- a/dak/generate_index_diffs.py 2008-05-03 23:51:04 +0000
+++ b/dak/generate_index_diffs.py 2008-05-05 19:32:00 +0000
@@ -32,7 +32,7 @@
import sys, os, tempfile
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/generate_releases.py'
--- a/dak/generate_releases.py 2008-05-05 12:47:34 +0000
+++ b/dak/generate_releases.py 2008-05-05 19:32:00 +0000
@@ -24,7 +24,7 @@
import sys, os, popen2, tempfile, stat, time, pg
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
from daklib.dak_exceptions import *
################################################################################
=== modified file 'dak/import_archive.py'
--- a/dak/import_archive.py 2008-05-05 12:47:34 +0000
+++ b/dak/import_archive.py 2008-05-05 19:32:00 +0000
@@ -38,8 +38,8 @@
import commands, os, pg, re, sys, time
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
from daklib.dak_exceptions import *
###############################################################################
=== modified file 'dak/import_keyring.py'
--- a/dak/import_keyring.py 2008-05-04 00:02:16 +0000
+++ b/dak/import_keyring.py 2008-05-05 19:32:00 +0000
@@ -19,8 +19,8 @@
################################################################################
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
import sys, os, re
import apt_pkg, pg, ldap, email.Utils
=== modified file 'dak/import_ldap_fingerprints.py'
--- a/dak/import_ldap_fingerprints.py 2008-05-04 00:05:26 +0000
+++ b/dak/import_ldap_fingerprints.py 2008-05-05 19:32:00 +0000
@@ -46,8 +46,8 @@
import commands, ldap, pg, re, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/import_users_from_passwd.py'
--- a/dak/import_users_from_passwd.py 2008-05-04 00:08:24 +0000
+++ b/dak/import_users_from_passwd.py 2008-05-05 19:32:00 +0000
@@ -31,7 +31,7 @@
import pg, pwd, sys
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/init_db.py'
--- a/dak/init_db.py 2008-05-04 00:08:24 +0000
+++ b/dak/init_db.py 2008-05-05 19:32:00 +0000
@@ -21,8 +21,8 @@
import pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/init_dirs.py'
--- a/dak/init_dirs.py 2008-05-04 00:14:07 +0000
+++ b/dak/init_dirs.py 2008-05-05 19:32:00 +0000
@@ -21,7 +21,7 @@
import os, sys
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/ls.py'
--- a/dak/ls.py 2008-05-04 00:14:07 +0000
+++ b/dak/ls.py 2008-05-05 19:32:00 +0000
@@ -28,8 +28,8 @@
import os, pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/make_maintainers.py'
--- a/dak/make_maintainers.py 2008-05-04 00:15:07 +0000
+++ b/dak/make_maintainers.py 2008-05-05 19:32:00 +0000
@@ -27,8 +27,8 @@
import pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/make_overrides.py'
--- a/dak/make_overrides.py 2008-05-04 00:19:01 +0000
+++ b/dak/make_overrides.py 2008-05-05 19:32:00 +0000
@@ -27,8 +27,8 @@
import pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/make_suite_file_list.py'
--- a/dak/make_suite_file_list.py 2008-05-04 00:19:01 +0000
+++ b/dak/make_suite_file_list.py 2008-05-05 19:32:00 +0000
@@ -36,9 +36,9 @@
import copy, os, pg, sys
import apt_pkg
import symlink_dists
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
################################################################################
=== modified file 'dak/new_security_install.py'
--- a/dak/new_security_install.py 2008-05-04 00:19:01 +0000
+++ b/dak/new_security_install.py 2008-05-05 19:32:00 +0000
@@ -20,10 +20,10 @@
################################################################################
-import daklib.queue as queue
-import daklib.logging as logging
-import daklib.utils as utils
-import daklib.database as database
+from daklib import queue
+from daklib import logging
+from daklib import utils
+from daklib import database
import apt_pkg, os, sys, pwd, time, re, commands
re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$");
=== modified file 'dak/override.py'
--- a/dak/override.py 2008-05-04 00:20:09 +0000
+++ b/dak/override.py 2008-05-05 19:32:00 +0000
@@ -27,9 +27,9 @@
import pg, sys
import apt_pkg
-import daklib.logging as logging
-import daklib.database as database
-import daklib.utils as utils
+from daklib import logging
+from daklib import database
+from daklib import utils
################################################################################
=== modified file 'dak/process_accepted.py'
--- a/dak/process_accepted.py 2008-05-04 00:27:13 +0000
+++ b/dak/process_accepted.py 2008-05-05 19:32:00 +0000
@@ -31,10 +31,10 @@
import errno, fcntl, os, sys, time, re
import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
###############################################################################
=== modified file 'dak/process_new.py'
--- a/dak/process_new.py 2008-05-04 00:28:42 +0000
+++ b/dak/process_new.py 2008-05-05 19:32:00 +0000
@@ -39,10 +39,10 @@
import copy, errno, os, readline, stat, sys, time
import apt_pkg, apt_inst
import examine_package
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
# Globals
Cnf = None
=== modified file 'dak/process_unchecked.py'
--- a/dak/process_unchecked.py 2008-05-05 12:44:31 +0000
+++ b/dak/process_unchecked.py 2008-05-05 19:32:00 +0000
@@ -30,10 +30,10 @@
import commands, errno, fcntl, os, re, shutil, stat, sys, time, tempfile, traceback
import apt_inst, apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
from daklib.dak_exceptions import *
from types import *
=== modified file 'dak/queue_report.py'
--- a/dak/queue_report.py 2008-05-05 12:08:51 +0000
+++ b/dak/queue_report.py 2008-05-05 19:32:00 +0000
@@ -36,8 +36,8 @@
import copy, glob, os, stat, sys, time
import apt_pkg
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import queue
+from daklib import utils
from daklib.dak_exceptions import *
Cnf = None
=== modified file 'dak/reject_proposed_updates.py'
--- a/dak/reject_proposed_updates.py 2008-05-03 12:47:13 +0000
+++ b/dak/reject_proposed_updates.py 2008-05-05 19:32:00 +0000
@@ -21,10 +21,10 @@
import os, pg, sys
import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
################################################################################
=== modified file 'dak/rm.py'
--- a/dak/rm.py 2008-05-05 12:47:34 +0000
+++ b/dak/rm.py 2008-05-05 19:32:00 +0000
@@ -41,8 +41,8 @@
import commands, os, pg, re, sys
import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
from daklib.dak_exceptions import *
################################################################################
=== modified file 'dak/security_install.py'
--- a/dak/security_install.py 2008-05-03 12:38:44 +0000
+++ b/dak/security_install.py 2008-05-05 19:32:00 +0000
@@ -32,7 +32,7 @@
import commands, os, pwd, re, sys, time
import apt_pkg
-import daklib.queue as queue
+from daklib import queue
import daklib.utils
################################################################################
=== modified file 'dak/show_new.py'
--- a/dak/show_new.py 2008-05-04 00:32:26 +0000
+++ b/dak/show_new.py 2008-05-05 19:32:00 +0000
@@ -28,9 +28,9 @@
import copy, os, sys, time
import apt_pkg
import examine_package
-import daklib.database as database
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import queue
+from daklib import utils
# Globals
Cnf = None
=== modified file 'dak/split_done.py'
--- a/dak/split_done.py 2008-05-04 00:32:54 +0000
+++ b/dak/split_done.py 2008-05-05 19:32:00 +0000
@@ -19,7 +19,7 @@
################################################################################
import glob, os, stat, time
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/stats.py'
--- a/dak/stats.py 2008-05-04 00:33:21 +0000
+++ b/dak/stats.py 2008-05-05 19:32:00 +0000
@@ -32,7 +32,7 @@
import pg, sys
import apt_pkg
-import daklib.utils as utils
+from daklib import utils
################################################################################
=== modified file 'dak/transitions.py'
--- a/dak/transitions.py 2008-05-05 14:18:07 +0000
+++ b/dak/transitions.py 2008-05-05 19:33:02 +0000
@@ -25,8 +25,8 @@
import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
from daklib.dak_exceptions import TransitionsError
import syck
Reply to: