X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=a6469e27f4dfdd8f90fb1c245851867259ef4e1e;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=ca119c8111613228d20b4b57ffe313c877b8b28b;hpb=7f20bb168b919452f8ee0c865ab91f0084a9f46a;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index ca119c81..a6469e27 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -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]+$");
@@ -235,10 +235,6 @@ def actually_upload(changes_files):
         files = Upload.pkg.files
         changes = Upload.pkg.changes
         dsc = Upload.pkg.dsc
-        # We have the changes, now return if its amd64, to not upload them to ftp-master
-        if changes["distribution"].has_key("oldstable-security") and changes["architecture"].has_key("amd64"):
-            print "Not uploading amd64 oldstable-security changes to ftp-master\n"
-            continue
         # Build the file list for this .changes file
         for file in files.keys():
             poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"],