Merge branch 'psycopg2' into content_generation

[dak.git] / dak / clean_proposed_updates.py

diff --git a/dak/clean_proposed_updates.py b/dak/clean_proposed_updates.py
index 3dd6e6f3dbad3bd34a3489751d5f769c3c825fa0..0e9c0b6eec2bf5c283317a0f28840ad2d87af27b 100755 (executable)
--- a/dak/clean_proposed_updates.py
+++ b/dak/clean_proposed_updates.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Remove obsolete .changes files from proposed-updates
+""" Remove obsolete .changes files from proposed-updates """
 # Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,11 @@
 
 ################################################################################
 
-import os, pg, re, sys
+import os, pg, sys
 import apt_pkg
 from daklib import database
 from daklib import utils
+from daklib.regexes import re_isdeb, re_isadeb, re_issource, re_no_epoch
 
 ################################################################################
 
@@ -31,8 +32,6 @@ projectB = None
 Options = None
 pu = {}
 
-re_isdeb = re.compile (r"^(.+)_(.+?)_(.+?).u?deb$")
-
 ################################################################################
 
 def usage (exit_code=0):
@@ -56,7 +55,7 @@ def check_changes (filename):
         return
     num_files = len(files.keys())
     for f in files.keys():
-        if utils.re_isadeb.match(f):
+        if re_isadeb.match(f):
             m = re_isdeb.match(f)
             pkg = m.group(1)
             version = m.group(2)
@@ -64,7 +63,7 @@ def check_changes (filename):
             if Options["debug"]:
                 print "BINARY: %s ==> %s_%s_%s" % (f, pkg, version, arch)
         else:
-            m = utils.re_issource.match(f)
+            m = re_issource.match(f)
             if m:
                 pkg = m.group(1)
                 version = m.group(2)
@@ -86,7 +85,7 @@ def check_changes (filename):
             # FIXME
             utils.warn("%s doesn't seem to exist for %s in %s?? (from %s [%s])" % (pkg, arch, Options["suite"], f, filename))
             continue
-        pu_version = utils.re_no_epoch.sub('', pu[pkg][arch])
+        pu_version = re_no_epoch.sub('', pu[pkg][arch])
         if pu_version == version:
             if Options["verbose"]:
                 print "%s: ok" % (f)