From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 27 Oct 2009 16:28:57 +0000 (+0100)
Subject: Merge branch 'merge'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=add275e4b0d5b93fbc7774078d1d7e9dcbb66de9;hp=6aef6d91df078ee04d6b3c7ee5d9d94d7028c96c;p=dak.git

Merge branch 'merge'

* merge:
  Monkeypatch commands.getstatusoutput to work around Python Popen issue.
  drop unused imports
---

diff --git a/dak/add_user.py b/dak/add_user.py
index 8da9dcdf..77de3e3f 100755
--- a/dak/add_user.py
+++ b/dak/add_user.py
@@ -18,13 +18,9 @@ add his key to the GPGKeyring
 # I know what I say. I dont know python and I wrote it. So go and read some other stuff.
 
 import commands
-import re
 import sys
-import time
-import os
 import apt_pkg
 
-from daklib import daklog
 from daklib import utils
 from daklib.dbconn import DBConn, add_database_user, get_or_set_uid
 from daklib.regexes import re_gpg_fingerprint, re_user_address, re_user_mails, re_user_name
diff --git a/dak/admin.py b/dak/admin.py
index e3d5298a..eb765a66 100755
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -25,7 +25,6 @@ import apt_pkg
 
 from daklib import utils
 from daklib.dbconn import *
-from daklib.config import Config
 
 ################################################################################
 
diff --git a/dak/check_archive.py b/dak/check_archive.py
index 6e3c795b..2162068e 100755
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -40,7 +40,6 @@ import apt_inst
 
 from daklib.dbconn import *
 from daklib import utils
-from daklib.regexes import re_issource
 from daklib.config import Config
 
 ################################################################################
diff --git a/dak/contents.py b/dak/contents.py
index 9ac99951..c435afc5 100755
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -37,7 +37,6 @@ Create all the contents files
 import sys
 import os
 import logging
-import math
 import gzip
 import threading
 import Queue
diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index cd63c2da..63374859 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -29,7 +29,7 @@
 
 ################################################################################
 
-import commands, os, sys, time, re
+import commands, os, sys, re
 import apt_pkg
 
 from daklib.config import Config
diff --git a/dak/dak.py b/dak/dak.py
index f3380091..052f3b3e 100755
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -34,7 +34,6 @@ G{importgraph}
 ################################################################################
 
 import sys
-import imp
 import daklib.utils
 
 ################################################################################
diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 21c631b9..4222c0cf 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -34,7 +34,6 @@
 import sys
 import os
 import tempfile
-import subprocess
 import time
 import apt_pkg
 
diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 06597f85..0b670357 100755
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -24,7 +24,6 @@ import apt_pkg, ldap, email.Utils
 
 from daklib.config import Config
 from daklib.dbconn import *
-from daklib import utils
 
 
 # Globals
diff --git a/dak/import_ldap_fingerprints.py b/dak/import_ldap_fingerprints.py
index ec27acbe..337edb61 100755
--- a/dak/import_ldap_fingerprints.py
+++ b/dak/import_ldap_fingerprints.py
@@ -44,7 +44,7 @@
 
 ################################################################################
 
-import commands, ldap, re, sys
+import commands, ldap, sys
 import apt_pkg
 
 from daklib.config import Config
diff --git a/dak/make_pkg_file_mapping.py b/dak/make_pkg_file_mapping.py
index 38a6bec2..c457820f 100755
--- a/dak/make_pkg_file_mapping.py
+++ b/dak/make_pkg_file_mapping.py
@@ -31,9 +31,6 @@ and binary package version it has in a standard rfc2822-like format.
 
 ################################################################################
 
-import os
-import sys
-
 from daklib.dbconn import *
 
 ################################################################################
diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 51c6a5d7..b18346c8 100755
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -40,14 +40,12 @@ import fcntl
 import os
 import sys
 from datetime import datetime
-import re
-import apt_pkg, commands
+import apt_pkg
 
 from daklib import daklog
 from daklib.queue import *
 from daklib import utils
 from daklib.dbconn import *
-from daklib.binary import copy_temporary_contents
 from daklib.dak_exceptions import *
 from daklib.regexes import re_default_answer, re_issource, re_fdnic
 from daklib.urgencylog import UrgencyLog
diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index cabdbf3f..856c1dfa 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -34,23 +34,14 @@ Checks Debian packages from Incoming
 
 ################################################################################
 
-import commands
 import errno
 import fcntl
 import os
-import re
-import shutil
-import stat
 import sys
-import time
 import traceback
-import tarfile
-import apt_inst
 import apt_pkg
-from debian_bundle import deb822
 
 from daklib.dbconn import *
-from daklib.binary import Binary
 from daklib import daklog
 from daklib.queue import *
 from daklib import utils
diff --git a/dak/queue_report.py b/dak/queue_report.py
index c60358f0..8e338e52 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -37,7 +37,6 @@
 from copy import copy
 import glob, os, stat, sys, time
 import apt_pkg
-import cgi
 
 from daklib import utils
 from daklib.changes import Changes
diff --git a/dak/rm.py b/dak/rm.py
index 8ed03412..fe763605 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -41,7 +41,6 @@
 
 import commands
 import os
-import re
 import sys
 import apt_pkg
 import apt_inst
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index d3cf6530..e8e1621d 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -22,7 +22,6 @@
 
 import sys, os, re, time
 import apt_pkg
-import tempfile
 from debian_bundle import deb822
 from daklib.dbconn import *
 from daklib import utils
diff --git a/dak/stats.py b/dak/stats.py
index 583178b2..7c61e2a4 100755
--- a/dak/stats.py
+++ b/dak/stats.py
@@ -34,8 +34,7 @@ import sys
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import DBConn, get_suite_architectures, Suite, Architecture, \
-                          BinAssociation
+from daklib.dbconn import DBConn, get_suite_architectures, Suite, Architecture
 
 ################################################################################
 
diff --git a/dak/transitions.py b/dak/transitions.py
index acae2072..4c4ac78e 100755
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -34,7 +34,6 @@ import time
 import errno
 import fcntl
 import tempfile
-import pwd
 import apt_pkg
 
 from daklib.dbconn import *
diff --git a/daklib/utils.py b/daklib/utils.py
index 6e363266..40410fbb 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -39,6 +39,7 @@ import time
 import re
 import string
 import email as modemail
+import subprocess
 
 from dbconn import DBConn, get_architecture, get_component, get_suite
 from dak_exceptions import *
@@ -63,6 +64,20 @@ key_uid_email_cache = {}  #: Cache for email addresses from gpg key uids
 known_hashes = [("sha1", apt_pkg.sha1sum, (1, 8)),
                 ("sha256", apt_pkg.sha256sum, (1, 8))] #: hashes we accept for entries in .changes/.dsc
 
+import commands
+def dak_getstatusoutput(cmd):
+    pipe = subprocess.Popen(cmd, shell=True, universal_newlines=True,
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
+    output = str.join("", pipe.stdout.readlines())
+
+    ret = pipe.wait()
+    if ret is None:
+        ret = 0
+
+    return ret, output
+commands.getstatusoutput = dak_getstatusoutput
+
 ################################################################################
 
 def html_escape(s):