From: Mark Hymers <mhy@debian.org>
Date: Mon, 5 May 2008 19:33:02 +0000 (+0100)
Subject: merge from mainline
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9e12bb14c839b31d48db95406b4497bb4cdffde;p=dak

merge from mainline
---

c9e12bb14c839b31d48db95406b4497bb4cdffde
diff --cc dak/transitions.py
index 5c81e03a,7133d841..a37dbef9
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@@ -25,8 -25,9 +25,9 @@@
  
  import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
  import apt_pkg
 -import daklib.database as database
 -import daklib.utils as utils
 +from daklib import database
 +from daklib import utils
+ from daklib.dak_exceptions import TransitionsError
  import syck
  
  # Globals