From 6cefc182680a5badbc9145e1ad8ecfbd1dd15555 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 7 Dec 2010 20:57:24 +0100 Subject: [PATCH] [services/entropy-pkgdelta-generator] use etpConst .md5 extension constant and remove stale .md5 files too on cleanup --- services/entropy-pkgdelta-generator | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/entropy-pkgdelta-generator b/services/entropy-pkgdelta-generator index 0c01225f1..88b618c17 100755 --- a/services/entropy-pkgdelta-generator +++ b/services/entropy-pkgdelta-generator @@ -67,7 +67,8 @@ def generate_package_deltas(directory): pkg_path_a, next_pkg_path) delta_path = os.path.join(directory, etpConst['packagesdeltasubdir'], delta_fn) - if os.path.lexists(delta_path) and os.path.lexists(delta_path + ".md5"): + delta_path_md5 = delta_path + etpConst['packagesmd5fileext'] + if os.path.lexists(delta_path) and os.path.lexists(delta_path_md5): sys.stderr.write(delta_path + " already exists\n") continue delta_file = entropy.tools.generate_entropy_delta(pkg_path_a, @@ -112,6 +113,10 @@ def cleanup_package_deltas(directory): sys.stderr.write("cannot remove %s: %s\n" % (old_pkg_delta, err)) rc = 1 + try: + os.remove(old_pkg_delta + etpConst['packagesmd5fileext']) + except OSError: + pass return rc def _generator_argv(argv):