From 6d166039bdf66c3ce1df115ff6728ca67003e232 Mon Sep 17 00:00:00 2001 From: lxnay Date: Tue, 18 Nov 2008 12:49:26 +0000 Subject: [PATCH] Entropy/entropyConstants: - always enable Gentoo-compat, remove ability to disable it git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2691 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropyConstants.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py index 3ede11757..f918e7b0e 100644 --- a/libraries/entropyConstants.py +++ b/libraries/entropyConstants.py @@ -637,7 +637,7 @@ def const_defaultSettings(rootdir): 'branches': [], # available branches, this only exists for the server part, these settings will be overridden by server.conf ones 'branch': "4", # default choosen branch (overridden by setting in repositories.conf) 'keywords': set([etpSys['arch'],"~"+etpSys['arch']]), # default allowed package keywords - 'gentoo-compat': False, # Gentoo compatibility (/var/db/pkg + Portage availability) + 'gentoo-compat': True, # Gentoo compatibility (/var/db/pkg + Portage availability) 'edbcounter': edbCOUNTER, 'filesystemdirs': ['/bin','/emul','/etc','/lib','/lib32','/lib64','/opt','/sbin','/usr','/var'], # directory of the filesystem 'filesystemdirsmask': [ @@ -1146,13 +1146,6 @@ def const_readEquoSettings(): if (loglevel > -1) and (loglevel < 3): etpConst['equologlevel'] = loglevel - elif line.startswith("gentoo-compat|") and (len(line.split("|")) == 2): - compatopt = line.split("|")[1].strip() - if compatopt.lower() in ("disable","disabled","false","0","no"): - etpConst['gentoo-compat'] = False - else: - etpConst['gentoo-compat'] = True - elif line.startswith("filesbackup|") and (len(line.split("|")) == 2): compatopt = line.split("|")[1].strip() if compatopt.lower() in ("disable","disabled","false","0","no"):