X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_archive.py;h=203221bee9d01a92e8c50d5c9219511765b3e8ac;hb=c9e12bb14c839b31d48db95406b4497bb4cdffde;hp=b8884ab242191b5f69a8673c06f65aaa64c3b14b;hpb=9678ddd39550f29a651ca1065dc0b4444e16d636;p=dak.git diff --git a/dak/import_archive.py b/dak/import_archive.py index b8884ab2..203221be 100755 --- a/dak/import_archive.py +++ b/dak/import_archive.py @@ -38,8 +38,9 @@ import commands, os, pg, re, sys, time 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 * ############################################################################### @@ -323,7 +324,7 @@ def process_sources (filename, suite, component, archive): suite_id = database.get_suite_id(suite) try: file = utils.open_file (filename) - except utils.cant_open_exc: + except CantOpenError: utils.warn("can't open '%s'" % (filename)) return Scanner = apt_pkg.ParseTagFile(file) @@ -406,7 +407,7 @@ def process_packages (filename, suite, component, archive): suite_id = database.get_suite_id(suite) try: file = utils.open_file (filename) - except utils.cant_open_exc: + except CantOpenError: utils.warn("can't open '%s'" % (filename)) return Scanner = apt_pkg.ParseTagFile(file)