From 7ddd7dfdf15297dd121e99bf9d52f1f6b7e83c2a Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Sat, 8 Dec 2007 13:20:30 +0000 Subject: [PATCH] fix other two bugs git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@815 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- client/triggerTools.py | 4 ++++ client/uiTools.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/client/triggerTools.py b/client/triggerTools.py index 61624ef46..d93ff216e 100644 --- a/client/triggerTools.py +++ b/client/triggerTools.py @@ -679,6 +679,10 @@ def set_binutils_profile(profile): @output: returns int() as exit status ''' def generate_icons_cache(cachedir): + if not etpConst['systemroot']: + myroot = "/" + else: + myroot = etpConst['systemroot']+"/" if os.access('/usr/bin/gtk-update-icon-cache',os.X_OK): os.system('ROOT="'+myroot+'" /usr/bin/gtk-update-icon-cache -qf '+cachedir) return 0 diff --git a/client/uiTools.py b/client/uiTools.py index ceae8da0e..0914e7e67 100644 --- a/client/uiTools.py +++ b/client/uiTools.py @@ -1117,7 +1117,8 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys dumpTools.dumpobj(etpCache['remove'],resume_cache) # unload dict - del etpRemovalTriggers[infoDict['removeatom']] + if not returnQueue: + del etpRemovalTriggers[infoDict['removeatom']] if not (etpUi['quiet'] or returnQueue): print_info(red(" @@ ")+blue("All done."))