From fa3b409c1008c7ad8425868e4cb4ebeaf61528ac Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Fri, 14 Dec 2007 18:21:07 +0000
Subject: [PATCH] whoops

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@876 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 libraries/activatorTools.py   | 4 ++++
 libraries/entropyConstants.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/activatorTools.py b/libraries/activatorTools.py
index 7f30ee3aa..09fef5b8a 100644
--- a/libraries/activatorTools.py
+++ b/libraries/activatorTools.py
@@ -168,6 +168,10 @@ def sync(options, justTidy = False):
 		    activatorLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"sync: removing (local) file "+file)
 		    print_info(green(" * ")+red("Package file: ")+bold(file)+red(" removed successfully from ")+bold(etpConst['packagesbindir']+"/"+mybranch))
 		    os.remove(etpConst['packagesbindir']+"/"+mybranch+"/"+file)
+                    try:
+                        os.remove(etpConst['packagesbindir']+"/"+mybranch+"/"+file+etpConst['packagesexpirationfileext'])
+                    except OSError:
+                        pass
 	        # checksum
 	        if os.path.isfile(etpConst['packagesbindir']+"/"+mybranch+"/"+file+etpConst['packageshashfileext']):
 		    activatorLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"sync: removing (local) file "+file+etpConst['packageshashfileext'])
diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py
index 25c4edf64..5672439be 100644
--- a/libraries/entropyConstants.py
+++ b/libraries/entropyConstants.py
@@ -475,7 +475,7 @@ dbCOUNTER = "COUNTER"
 
 def initConfig_entropyConstants(rootdir):
 
-    if not os.path.isdir(rootdir):
+    if rootdir and not os.path.isdir(rootdir):
         raise exceptionTools.FileNotFound("FileNotFound: not a valid chroot.")
 
     ETP_DIR = rootdir+"/var/lib/entropy"