sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entropy/PackageInterface:

Browse Source 
- __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
This commit is contained in:
lxnay
2009-01-03 22:03:53 +00:00
parent 30661a5ae6
commit f876e7909e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy.py
+2 -2
View File
@@ -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