From 0499786b1d57ff2d76f946467c972a1815802a94 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 24 May 2007 12:13:29 +0000 Subject: [PATCH] - Forward port from trunk: these comments should exists in trunk: * created pisi.conf should have the values uncommented, these are the real values anyway. * package_cache default is set to False for package-manager for a new Pardus installation. This was the default behaviour for pm. But if a pisi.conf file exists (for an already installed system), setup.py does not overwrite it. So no package_cache_X values will be in pisi.conf. (Question: Why do we create pisi.conf in setup.py, why not an additional file) In this case package-manager's default is, use package cache to keep user's cached packages. - TODO: pisi should use these values in cli also, cause this is pisi.conf! or maybe this was not the right place for this from the start or was it? :/ --- pisi/configfile.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/configfile.py b/pisi/configfile.py index 8cda7a00..1b41d979 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -67,7 +67,7 @@ class GeneralDefaults: http_proxy = (os.getenv("http_proxy") or os.getenv("HTTP_PROXY")) or None https_proxy = (os.getenv("https_proxy") or os.getenv("HTTPS_PROXY")) or None ftp_proxy = (os.getenv("ftp_proxy") or os.getenv("FTP_PROXY")) or None - package_cache = True + package_cache = False package_cache_limit = 0 class BuildDefaults: diff --git a/setup.py b/setup.py index 8ac4eb52..d5b1ac7b 100755 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ class Install(install): and not m[0].endswith('__')] for member in section_members: - pisiconf.write("# %s = %s\n" % (member[0], member[1])) + pisiconf.write("%s = %s\n" % (member[0], member[1])) pisiconf.write('\n')