diff --git a/handlers/md5sum.php b/handlers/md5sum.php index 68ef0d717..ca17e8ad1 100644 --- a/handlers/md5sum.php +++ b/handlers/md5sum.php @@ -13,7 +13,7 @@ sqlite_query($db, $sql); } - $pkgfile = urldecode($_GET['package']); + $pkgfile = rawurldecode($_GET['package']); $pkgarch = $_GET['arch']; $pkgpath = "../packages/" . $pkgarch . "/" . $pkgfile; diff --git a/libraries/activatorTools.py b/libraries/activatorTools.py index 1b7a78ab6..f47a8f42e 100644 --- a/libraries/activatorTools.py +++ b/libraries/activatorTools.py @@ -453,7 +453,7 @@ def packages(options): uploadQueueLength += 1 print_info(red(" * ")+blue("Packages that would be ")+red("removed:\t\t\t")+bold(str(removalQueueLength))) - print_info(red(" * ")+blue("Packages that would be ")+yellow("downloaded/moved locally:\t\t")+bold(str(downloadQueueLength))) + print_info(red(" * ")+blue("Packages that would be ")+yellow("downloaded/moved locally:\t")+bold(str(downloadQueueLength))) print_info(red(" * ")+blue("Packages that would be ")+green("uploaded:\t\t\t")+bold(str(uploadQueueLength))) print_info(red(" * ")+blue("Total removal ")+red("size:\t\t\t\t")+bold(bytesIntoHuman(str(totalRemovalSize)))) print_info(red(" * ")+blue("Total download ")+yellow("size:\t\t\t\t")+bold(bytesIntoHuman(str(totalDownloadSize)))) diff --git a/libraries/portageTools.py b/libraries/portageTools.py index f66da192a..e4c3093b8 100644 --- a/libraries/portageTools.py +++ b/libraries/portageTools.py @@ -224,6 +224,8 @@ def quickpkg(atom,dirpath): pkgname = atom.split("/")[1] pkgcat = atom.split("/")[0] pkgfile = pkgname+".tbz2" + if not os.path.isdir(dirpath): + os.makedirs(dirpath) dirpath += "/"+pkgname+".tbz2" dbdir = getPortageAppDbPath()+"/"+pkgcat+"/"+pkgname+"/" diff --git a/libraries/remoteTools.py b/libraries/remoteTools.py index c9de4097a..1611cf315 100644 --- a/libraries/remoteTools.py +++ b/libraries/remoteTools.py @@ -53,6 +53,8 @@ def getRemotePackageChecksum(servername, filename, branch): # does the package has "#" (== tag) ? hackish thing that works filename = filename.replace("#","%23") + # "+" + filename = filename.replace("+","%2b") request = url+etpHandlers['md5sum']+filename+"&branch="+branch remoteLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"getRemotePackageChecksum: requested url -> "+request)