Merge commit 'ftpmaster/master' into regexes

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index d7e813a972ff362a853f42f581ac99c6ac3f7ced..5bebe8efd32c8a2fa812d1b5f2b1333c71536587 100755 (executable)
--- 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):