backport remove suffix and compiled_packages_dir patches from trunk
This commit is contained in:
+1
-1
@@ -663,7 +663,7 @@ class Builder:
|
|||||||
except Error:
|
except Error:
|
||||||
ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn)
|
ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn)
|
||||||
|
|
||||||
for root, dirs, files in os.walk(ctx.config.packages_dir()):
|
for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()):
|
||||||
for file in files:
|
for file in files:
|
||||||
locate_old_package(join(root,file))
|
locate_old_package(join(root,file))
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
#db_dir = /var/db/pisi
|
#db_dir = /var/db/pisi
|
||||||
#archives_dir = /var/cache/pisi/archives
|
#archives_dir = /var/cache/pisi/archives
|
||||||
#packages_dir = /var/cache/pisi/packages
|
#packages_dir = /var/cache/pisi/packages
|
||||||
|
#compiled_packages_dir = "/var/cache/pisi/packages"
|
||||||
#index_dir = /var/cache/pisi/index
|
#index_dir = /var/cache/pisi/index
|
||||||
#tmp_dir = /var/tmp/pisi
|
#tmp_dir = /var/tmp/pisi
|
||||||
#kde_dir = /usr/kde/3.5
|
#kde_dir = /usr/kde/3.5
|
||||||
@@ -84,6 +85,7 @@ class DirectoriesDefaults:
|
|||||||
db_dir = "/var/db/pisi"
|
db_dir = "/var/db/pisi"
|
||||||
archives_dir = "/var/cache/pisi/archives"
|
archives_dir = "/var/cache/pisi/archives"
|
||||||
packages_dir = "/var/cache/pisi/packages"
|
packages_dir = "/var/cache/pisi/packages"
|
||||||
|
compiled_packages_dir = "/var/cache/pisi/packages"
|
||||||
index_dir = "/var/lib/pisi/index"
|
index_dir = "/var/lib/pisi/index"
|
||||||
tmp_dir = "/var/pisi"
|
tmp_dir = "/var/pisi"
|
||||||
kde_dir = "/usr/kde/3.5"
|
kde_dir = "/usr/kde/3.5"
|
||||||
|
|||||||
@@ -468,6 +468,8 @@ def uncompress(patchFile, compressType="gz", targetDir=None):
|
|||||||
os.path.basename(patchFile))
|
os.path.basename(patchFile))
|
||||||
else:
|
else:
|
||||||
filePath = os.path.basename(patchFile)
|
filePath = os.path.basename(patchFile)
|
||||||
|
# remove suffix from file cause its uncompressed now
|
||||||
|
filePath = filePath.split(".%s" % compressType)[0]
|
||||||
|
|
||||||
if compressType == "gz":
|
if compressType == "gz":
|
||||||
from gzip import GzipFile
|
from gzip import GzipFile
|
||||||
|
|||||||
Reference in New Issue
Block a user