backend/server/rhnPackage.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 12c7f3d2b73b283d92b397e4e55b9c42656ee640
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 2 23:43:52 2011 +0200
In any case, do not attempt to remove /var/satellite
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index d375f6d..3413a86 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -111,8 +111,8 @@ def unlink_package_file(path):
except OSError:
log_debug(1, "Error unlinking %s;" % path)
dirname = os.path.dirname(path)
- base_dir = CFG.MOUNT_POINT + '/' + CFG.PREPENDED_DIR
- while dirname != base_dir:
+ base_dirs = (CFG.MOUNT_POINT + '/' + CFG.PREPENDED_DIR, CFG.MOUNT_POINT)
+ while dirname not in base_dirs:
try:
os.rmdir(dirname)
except OSError, e:
Show replies by date