Fix number of removed files when rmtree'ing directories

[dak.git] / dak / make_changelog.py

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index a34d10bd9266da675f428a3c527a587fa95c859b..eeb738e5f8e49a407c11f2912efe6087ab02e113 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -77,7 +77,8 @@ Options:
   -n, --binnmu              display binNMUs uploads instead of source ones
 
   -e, --export              export interesting files from source packages
-  -a, --archive             archive to fetch data from"""
+  -a, --archive             archive to fetch data from
+  -p, --progress            display progress status"""
 
     sys.exit(exit_code)
 
@@ -161,7 +162,7 @@ def display_changes(uploads, index):
         print upload[index]
         prev_upload = upload[0]
 
-def export_files(session, archive, clpool):
+def export_files(session, archive, clpool, progress=False):
     """
     Export interesting files from source packages.
     """
@@ -193,7 +194,7 @@ def export_files(session, archive, clpool):
             if not os.path.exists(path):
                 os.makedirs(path)
             if not os.path.exists(os.path.join(path, \
-                   '%s_%s.changelog' % (p, sources[p][s][0]))):
+                   '%s_%s_changelog' % (p, sources[p][s][0]))):
                 if not unpack.has_key(os.path.join(pool, sources[p][s][1])):
                     unpack[os.path.join(pool, sources[p][s][1])] = (path, set())
                 unpack[os.path.join(pool, sources[p][s][1])][1].add(s)
@@ -213,12 +214,17 @@ def export_files(session, archive, clpool):
             unpacked = UnpackedSource(p)
             tempdir = unpacked.get_root_directory()
             stats['unpack'] += 1
+            if progress:
+                if stats['unpack'] % 100 == 0:
+                    sys.stderr.write('%d packages unpacked\n' % stats['unpack'])
+                elif stats['unpack'] % 10 == 0:
+                    sys.stderr.write('.')
             for file in files:
                 for f in glob(os.path.join(tempdir, 'debian', '*%s' % file)):
                     for s in unpack[p][1]:
-                        suite = os.path.join(unpack[p][0], '%s.%s' \
+                        suite = os.path.join(unpack[p][0], '%s_%s' \
                                 % (s, os.path.basename(f)))
-                        version = os.path.join(unpack[p][0], '%s_%s.%s' % \
+                        version = os.path.join(unpack[p][0], '%s_%s_%s' % \
                                   (package[0], package[1], os.path.basename(f)))
                         if not os.path.exists(version):
                             os.link(f, version)
@@ -238,13 +244,13 @@ def export_files(session, archive, clpool):
         if len(files):
             if root.split('/')[-1] not in sources.keys():
                 if os.path.exists(root):
+                    stats['removed'] += len(os.listdir(root))
                     rmtree(root)
-                    stats['removed'] += 1
             for file in files:
                 if os.path.exists(os.path.join(root, file)):
                     if os.stat(os.path.join(root, file)).st_nlink ==  1:
-                        os.unlink(os.path.join(root, file))
                         stats['removed'] += 1
+                        os.unlink(os.path.join(root, file))
 
     for root, dirs, files in os.walk(clpool):
         stats['files'] += len(files)
@@ -263,9 +269,10 @@ def main():
                  ('s','suite','Make-Changelog::Options::Suite','HasArg'),
                  ('b','base-suite','Make-Changelog::Options::Base-Suite','HasArg'),
                  ('n','binnmu','Make-Changelog::Options::binNMU'),
-                 ('e','export','Make-Changelog::Options::export')]
+                 ('e','export','Make-Changelog::Options::export'),
+                 ('p','progress','Make-Changelog::Options::progress')]
 
-    for i in ['help', 'suite', 'base-suite', 'binnmu', 'export']:
+    for i in ['help', 'suite', 'base-suite', 'binnmu', 'export', 'progress']:
         if not Cnf.has_key('Make-Changelog::Options::%s' % (i)):
             Cnf['Make-Changelog::Options::%s' % (i)] = ''
 
@@ -275,6 +282,7 @@ def main():
     base_suite = Cnf['Make-Changelog::Options::Base-Suite']
     binnmu = Cnf['Make-Changelog::Options::binNMU']
     export = Cnf['Make-Changelog::Options::export']
+    progress = Cnf['Make-Changelog::Options::progress']
 
     if Options['help'] or not (suite and base_suite) and not export:
         usage()
@@ -289,7 +297,7 @@ def main():
         if cnf.exportpath:
             archive = session.query(Archive).filter_by(archive_name=Options['Archive']).one()
             exportpath = os.path.join(Cnf['Dir::Export'], cnf.exportpath)
-            export_files(session, archive, exportpath)
+            export_files(session, archive, exportpath, progress)
         else:
             utils.fubar('No changelog export path defined')
     elif binnmu: