X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmirror_split.py;h=89af72fdb2761e2cd66adf3bbcec180ce41644bd;hb=7aaaad3135c9164390af5897925660842368660b;hp=63096877f3ecda9e335494d3f2a89b39d7360d36;hpb=65153ef97e5567c0fc85142b16294fe6bb68e0ae;p=dak.git diff --git a/dak/mirror_split.py b/dak/mirror_split.py index 63096877..89af72fd 100755 --- a/dak/mirror_split.py +++ b/dak/mirror_split.py @@ -24,13 +24,14 @@ ############################################################################### import sys -import dak.lib.utils import apt_pkg from stat import S_ISDIR, S_ISLNK, S_ISREG import os import cPickle +import dak.lib.utils as utils + ## Master path is the main repository #MASTER_PATH = "/org/ftp.debian.org/scratch/dsilvers/master" @@ -166,7 +167,7 @@ class MirrorSplitDB: elif S_ISREG(lnl[0]): bdir.files[ln] = lnl[1] else: - dak.lib.utils.fubar( "Confused by %s/%s -- not a dir, link or file" % + utils.fubar( "Confused by %s/%s -- not a dir, link or file" % ( path, ln ) ) for d in dirs: bdir.dirs[d] = self._internal_recurse( "%s/%s" % (path,d) ) @@ -350,7 +351,7 @@ Generate hardlink trees of certain architectures def main (): global Cnf - Cnf = dak.lib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('h',"help","Mirror-Split::Options::Help"), ('l',"list","Mirror-Split::Options::List"),