X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_accepted.py;h=a29c892185c6f93626e2c8563a26dd6ba13bddcc;hb=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;hp=a25c391fc374f9d286d8e515ecf74adfa64e9684;hpb=0952a111218688c6b3c29c7d25a94b526699ecfb;p=dak.git diff --git a/dak/process_accepted.py b/dak/process_accepted.py index a25c391f..a29c8921 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -36,6 +36,7 @@ from daklib import logging from daklib import queue from daklib import utils from daklib.dak_exceptions import * +from daklib.regexes import re_default_answer, re_issource, re_fdnic ############################################################################### @@ -220,7 +221,7 @@ def action (): while prompt.find(answer) == -1: answer = utils.our_raw_input(prompt) - m = queue.re_default_answer.match(prompt) + m = re_default_answer.match(prompt) if answer == "": answer = m.group(1) answer = answer[:1].upper() @@ -538,11 +539,11 @@ def stable_install (summary, short_summary): for newfile in files.keys(): if files[newfile]["type"] == "deb": new_changelog.write("stable/%s/binary-%s/%s\n" % (files[newfile]["component"], files[newfile]["architecture"], newfile)) - elif utils.re_issource.match(newfile): + elif re_issource.match(newfile): new_changelog.write("stable/%s/source/%s\n" % (files[newfile]["component"], newfile)) else: new_changelog.write("%s\n" % (newfile)) - chop_changes = queue.re_fdnic.sub("\n", changes["changes"]) + chop_changes = re_fdnic.sub("\n", changes["changes"]) new_changelog.write(chop_changes + '\n\n') if os.access(changelog_filename, os.R_OK) != 0: changelog = utils.open_file(changelog_filename)