- fixed entropyConstants import

- fixed online database file detection (.gz was missing)



git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@234 cd1c1023-2f26-0410-ae45-c471fc1f0318

libraries/entropyTools.py

@@ -22,6 +22,7 @@
 
 # FIXME: this depends on portage, should be moved from here ASAP
 from output import *
+from entropyConstants import *
 
 import re
 import sys
@@ -100,7 +101,7 @@ def getEtpRemoteDatabaseStatus():
     for uri in etpConst['activatoruploaduris']:
 	ftp = databaseTools.handlerFTP(uri)
 	ftp.setCWD(etpConst['etpurirelativepath'])
-	rc = ftp.isFileAvailable(etpConst['etpdatabasefile'])
+	rc = ftp.isFileAvailable(etpConst['etpdatabasefilegzip'])
 	if (rc):
 	    # then get the file revision, if exists
 	    rc = ftp.isFileAvailable(etpConst['etpdatabaserevisionfile'])
@@ -114,9 +115,10 @@ def getEtpRemoteDatabaseStatus():
 	    else:
 		revision = 0
 	else:
+	    print "database file not avail"
 	    # then set mtime to 0 and quit
 	    revision = 0
-	info = [uri+"/"+etpConst['etpurirelativepath']+etpConst['etpdatabasefile'],revision]
+	info = [uri+"/"+etpConst['etpurirelativepath']+etpConst['etpdatabasefilegzip'],revision]
 	uriDbInfo.append(info)
 	ftp.closeFTPConnection()
 

libraries/reagentTools.py

@@ -301,7 +301,7 @@ def extractPkgData(package):
     
     # fill ARCHs
     pkgArchs = etpData['keywords']
-    for i in ETP_ARCHS:
+    for i in etpConst['supportedarchs']:
         if pkgArchs.find(i) != -1 and (pkgArchs.find("-"+i) == -1): # in case we find something like -amd64...
 	    etpData['binkeywords'] += i+" "
     etpData['binkeywords'] = removeSpaceAtTheEnd(etpData['binkeywords'])