X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fclean_proposed_updates.py;h=0e9c0b6eec2bf5c283317a0f28840ad2d87af27b;hb=574fb13e8dc253e39da7b6259617aafa74c1ec2d;hp=76a2778c1a1605ee328fa08952d360e85cd89915;hpb=2c639c40c65966711c82d46a6f4ee8739e819aad;p=dak.git diff --git a/dak/clean_proposed_updates.py b/dak/clean_proposed_updates.py index 76a2778c..0e9c0b6e 100755 --- 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 # This program is free software; you can redistribute it and/or modify @@ -23,7 +23,7 @@ import os, pg, sys import apt_pkg from daklib import database from daklib import utils -from daklib.regexes import re_isdeb +from daklib.regexes import re_isdeb, re_isadeb, re_issource, re_no_epoch ################################################################################ @@ -55,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) @@ -63,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) @@ -85,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)