From bd4ec10402a3806b1c855460f247b6063f8e52cf Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 4 Jun 2009 22:26:33 +0200 Subject: [PATCH] create md5 hash of packages when using the flushback tool --- libraries/entropy/server/interfaces/main.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py index c410b7a6f..43f0e1f4c 100644 --- a/libraries/entropy/server/interfaces/main.py +++ b/libraries/entropy/server/interfaces/main.py @@ -1577,11 +1577,10 @@ class Server(Singleton, TextInterface): for package_path, idpackage in down_queue: self.updateProgress( - "[%s=>%s|%s|%s] %s: %s" % ( + "[%s=>%s|%s] %s: %s" % ( darkgreen(from_branch), darkred(branch), brown(repo), - dbconn.retrieveAtom(idpackage), blue(_("updating package")), darkgreen(os.path.basename(package_path)), ), @@ -1594,7 +1593,13 @@ class Server(Singleton, TextInterface): # move files to upload package_name = os.path.basename(package_path) new_package_path = os.path.join(local_basedir, package_name) - shutil.move(package_path, new_package_path) + try: + os.rename(package_path, new_package_path) + except OSError: + shutil.move(package_path, new_package_path) + + # create md5 checksum + self.entropyTools.create_md5_file(new_package_path) # update database download_url = dbconn.retrieveDownloadURL(idpackage) @@ -1606,11 +1611,10 @@ class Server(Singleton, TextInterface): dbconn.commitChanges() self.updateProgress( - "[%s=>%s|%s|%s] %s: %s" % ( + "[%s=>%s|%s] %s: %s" % ( darkgreen(from_branch), darkred(branch), brown(repo), - dbconn.retrieveAtom(idpackage), blue(_("package flushed")), darkgreen(os.path.basename(package_path)), ),