From f876e7909e19bd0e366263f4cac067ff4b4b1443 Mon Sep 17 00:00:00 2001 From: lxnay Date: Sat, 3 Jan 2009 22:03:53 +0000 Subject: [PATCH] Entropy/PackageInterface: - __move_image_to_system: consider systemroot when generating my_remove_content git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2840 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entropy.py b/libraries/entropy.py index c7835f5a2..22444b321 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -5023,7 +5023,7 @@ class PackageInterface: ETP_LOGLEVEL_NORMAL, "WARNING!!! %s is a file when it should be a directory !! Removing in 20 seconds..." % (rootdir,) ) - mytxt = darkred(_("%s is a file when should be a directory !! Removing in 20 seconds..." % (rootdir,))) + mytxt = darkred(_("%s is a file when should be a directory !! Removing in 20 seconds...") % (rootdir,)) self.Entropy.updateProgress( red("QA: ")+mytxt, importance = 1, @@ -5147,7 +5147,7 @@ class PackageInterface: # EntropyDatabaseInterface.contentDiff for obvious reasons (think about stuff in /usr/lib and /usr/lib64, # where the latter is just a symlink to the former) if self.infoDict.get('removecontent'): - my_remove_content = set([x for x in self.infoDict['removecontent'] if os.path.join(os.path.realpath(os.path.dirname(x)),os.path.basename(x)) in items_installed]) + my_remove_content = set([x for x in self.infoDict['removecontent'] if os.path.join(os.path.realpath(os.path.dirname("%s%s" % (sys_root,x,))),os.path.basename(x)) in items_installed]) self.infoDict['removecontent'] -= my_remove_content return 0