[dak/master] remove accepted references
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/debian/dak.conf | 1 -
dak/check_overrides.py | 7 -------
dak/import_known_changes.py | 2 +-
daklib/queue.py | 8 ++++----
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b254a7a..ceafaed 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -557,7 +557,6 @@ Dir
UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
Queue
{
- Accepted "/srv/ftp.debian.org/queue/accepted/";
Byhand "/srv/ftp.debian.org/queue/byhand/";
ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/";
diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 1e9a6d6..2987f9b 100755
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -77,11 +77,6 @@ Check for cruft in overrides.
################################################################################
-def gen_blacklist(dir):
- for entry in os.listdir(dir):
- entry = entry.split('_')[0]
- blacklist[entry] = 1
-
def process(osuite, affected_suites, originosuite, component, otype, session):
global Logger, Options, sections, priorities
@@ -342,8 +337,6 @@ def main ():
else:
Logger = daklog.Logger(cnf, "check-overrides", 1)
- gen_blacklist(cnf["Dir::Queue::Accepted"])
-
for osuite in cnf.SubTree("Check-Overrides::OverrideSuites").List():
if "1" != cnf["Check-Overrides::OverrideSuites::%s::Process" % osuite]:
continue
diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py
index c8d5bf9..84444ff 100755
--- a/dak/import_known_changes.py
+++ b/dak/import_known_changes.py
@@ -201,7 +201,7 @@ class ChangesGenerator(threading.Thread):
def run(self):
cnf = Config()
count = 1
- for directory in [ "Accepted", "Byhand", "Done", "New", "ProposedUpdates", "OldProposedUpdates" ]:
+ for directory in [ "Byhand", "Done", "New", "ProposedUpdates", "OldProposedUpdates" ]:
checkdir = cnf["Dir::Queue::%s" % (directory) ]
if os.path.exists(checkdir):
print "Looking into %s" % (checkdir)
diff --git a/daklib/queue.py b/daklib/queue.py
index a91bcdf..2589036 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -661,7 +661,7 @@ class Upload(object):
entry["new"] = 1
else:
dsc_file_exists = False
- for myq in ["Accepted", "Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates"]:
+ for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates"]:
if cnf.has_key("Dir::Queue::%s" % (myq)):
if os.path.exists(os.path.join(cnf["Dir::Queue::" + myq], dsc_filename)):
dsc_file_exists = True
@@ -1225,7 +1225,7 @@ class Upload(object):
continue
# Look in some other queues for the file
- queues = ('Accepted', 'New', 'Byhand', 'ProposedUpdates',
+ queues = ('New', 'Byhand', 'ProposedUpdates',
'OldProposedUpdates', 'Embargoed', 'Unembargoed')
for queue in queues:
@@ -2453,7 +2453,7 @@ distribution."""
else:
# TODO: Record the queues and info in the DB so we don't hardcode all this crap
# Not there? Check the queue directories...
- for directory in [ "Accepted", "New", "Byhand", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]:
+ for directory in [ "New", "Byhand", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]:
if not Cnf.has_key("Dir::Queue::%s" % (directory)):
continue
in_otherdir = os.path.join(Cnf["Dir::Queue::%s" % (directory)], dsc_name)
@@ -2502,7 +2502,7 @@ distribution."""
source_epochless_version = re_no_epoch.sub('', source_version)
dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
found = False
- for q in ["Accepted", "Embargoed", "Unembargoed", "Newstage"]:
+ for q in ["Embargoed", "Unembargoed", "Newstage"]:
if cnf.has_key("Dir::Queue::%s" % (q)):
if os.path.exists(cnf["Dir::Queue::%s" % (q)] + '/' + dsc_filename):
found = True
--
1.6.3.3
Reply to: