From 98d876978dcc1503ec2cc6a66b1debd2fdcb44d8 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Wed, 19 Sep 2007 22:37:06 +0000
Subject: [PATCH] some updates to support the future branches structure

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@500 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 client/equoTools.py      | 17 +++++++++--------
 libraries/mirrorTools.py |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/equoTools.py b/client/equoTools.py
index faf10c6da..999fdae0c 100644
--- a/client/equoTools.py
+++ b/client/equoTools.py
@@ -1081,6 +1081,12 @@ def removeFile(idpackage, clientDbconn = None, newContent = []):
 	file = file.encode(sys.getfilesystemencoding())
 	try:
 	    os.remove(file)
+	    # also remove py[c,o]?
+	    if file.endswith(".py"):
+		if os.path.exists(file+"c"):
+		    os.remove(file+"c")
+		if os.path.exists(file+"o"):
+		    os.remove(file+"o")
 	    #print file
 	    # is now empty?
 	    filedir = os.path.dirname(file)
@@ -1123,10 +1129,7 @@ def installFile(infoDict, clientDbconn = None):
     imageDir = unpackDir+"/image"
     os.makedirs(imageDir)
     
-    rc = uncompressTarBz2(pkgpath,unpackDir)
-    if (rc != 0):
-	return rc
-    rc = uncompressTarBz2(unpackDir+etpConst['packagecontentdir']+"/"+package,imageDir)
+    rc = uncompressTarBz2(pkgpath,imageDir)
     if (rc != 0):
 	return rc
     if not os.path.isdir(imageDir):
@@ -1196,8 +1199,6 @@ def installFile(infoDict, clientDbconn = None):
 	    except:
 		pass # sometimes, gentoo packages are fucked up and contain broken symlinks
 
-    shutil.rmtree(imageDir,True) # rm and ignore errors
-    
     if (removePackage != -1):
 	# doing a diff removal
 	if (etpConst['gentoo-compat']):
@@ -1210,13 +1211,13 @@ def installFile(infoDict, clientDbconn = None):
 	clientDbconn.closeDB()
 
     if (etpConst['gentoo-compat']):
-	rc = installPackageIntoGentooDatabase(infoDict,unpackDir+etpConst['packagecontentdir']+"/"+package)
+	rc = installPackageIntoGentooDatabase(infoDict,pkgpath)
 	if (rc >= 0):
 	    shutil.rmtree(unpackDir,True)
 	    return rc
     
     # remove unpack dir
-    shutil.rmtree(unpackDir,True)
+    shutil.rmtree(imageDir,True)
     return 0
 
 '''
diff --git a/libraries/mirrorTools.py b/libraries/mirrorTools.py
index 0abab7969..ab6f26774 100644
--- a/libraries/mirrorTools.py
+++ b/libraries/mirrorTools.py
@@ -288,7 +288,7 @@ class handlerFTP:
 	    except Exception, e: # connection reset by peer
 		mirrorLog.log(ETP_LOGPRI_WARNING,ETP_LOGLEVEL_NORMAL,"handlerFTP.uploadFile: Caught Exception: "+str(e)+", upload issues, retrying...")
 		import traceback
-		traceback.print_stack()
+		traceback.print_exc()
 		print_warning("")
 		print_warning(red("  Upload issue: ")+bold(str(e))+red(", retrying... #"+str(i+1)))
 		self.reconnectHost() # reconnect