From 607c10f0f75e3fa405250e5ee0f0084a6b28985f Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 1 Feb 2010 23:07:43 +0100 Subject: [PATCH] enable "files" to run again Signed-off-by: Joerg Jaspert --- dak/check_archive.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dak/check_archive.py b/dak/check_archive.py index 8982ea4e..a88f8eba 100755 --- a/dak/check_archive.py +++ b/dak/check_archive.py @@ -95,8 +95,7 @@ def process_dir (unused, dirname, filenames): if dirname.find('proposed-updates') != -1: return for name in filenames: - filename = os.path.abspath(dirname+'/'+name) - filename = filename.replace('potato-proposed-updates', 'proposed-updates') + filename = os.path.abspath(os.path.join(dirname,name)) if os.path.isfile(filename) and not os.path.islink(filename) and not db_files.has_key(filename) and not excluded.has_key(filename): waste += os.stat(filename)[stat.ST_SIZE] print "%s" % (filename) @@ -119,7 +118,7 @@ def check_files(): db_files.clear() for f in q.all(): - filename = os.path.abspath(f.location.path, f.filename) + filename = os.path.abspath(os.path.join(f.location.path, f.filename)) db_files[filename] = "" if os.access(filename, os.R_OK) == 0: if f.last_used: @@ -137,7 +136,7 @@ def check_files(): print "Existent files not in db:" - os.path.walk(cnf["Dir::Root"] + 'pool/', process_dir, None) + os.path.walk(os.path.join(cnf["Dir::Root"], 'pool/'), process_dir, None) print print "%s wasted..." % (utils.size_type(waste)) -- 2.39.5