X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fqueue.py;h=5bebe8efd32c8a2fa812d1b5f2b1333c71536587;hb=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;hp=1a4bb3b345a368c0f2040f46263ca046382a23f5;hpb=44eaf60968134772f72e3713e69bec1f8f33bb00;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 1a4bb3b3..5bebe8ef 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -24,18 +24,12 @@ import cPickle, errno, os, pg, re, stat, sys, time import apt_inst, apt_pkg import utils, database from dak_exceptions import * +from regexes import re_default_answer, re_fdnic, re_bin_only_nmu from types import * ############################################################################### -re_isanum = re.compile (r"^\d+$") -re_default_answer = re.compile(r"\[(.*)\]") -re_fdnic = re.compile(r"\n\n") -re_bin_only_nmu = re.compile(r"\+b\d+$") - -################################################################################ - # Determine what parts in a .changes are NEW def determine_new(changes, files, projectB, warn=1): @@ -507,7 +501,7 @@ distribution.""" filename = "%s/%s" % (Cnf["Dir::Queue::BTSVersionTrack"], changes_file[:-8]+".versions") os.rename(temp_filename, filename) - os.chmod(filename, "0644") + os.chmod(filename, 0644) # Write out the binary -> source mapping. (fd, temp_filename) = utils.temp_filename(Cnf["Dir::Queue::BTSVersionTrack"], prefix=".") @@ -523,7 +517,7 @@ distribution.""" filename = "%s/%s" % (Cnf["Dir::Queue::BTSVersionTrack"], changes_file[:-8]+".debinfo") os.rename(temp_filename, filename) - os.chmod(filename, "0644") + os.chmod(filename, 0644) self.queue_build("accepted", Cnf["Dir::Queue::Accepted"])