diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-22 16:49:46 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-22 16:49:46 -0700 |
| commit | c5142aadedee5b1917607f10d5018b763ef2419b (patch) | |
| tree | a3487b3dd4931e13c6cad556cf09064f24a073d5 /pym/portage/_sets/files.py | |
| parent | d1a59831eb2a5205d050884c760cca1d73be8fdf (diff) | |
| download | portage-c5142aadedee5b1917607f10d5018b763ef2419b.tar.gz portage-c5142aadedee5b1917607f10d5018b763ef2419b.tar.bz2 portage-c5142aadedee5b1917607f10d5018b763ef2419b.zip | |
Enable /etc/portage/sets for stable, bug #384061.
Diffstat (limited to 'pym/portage/_sets/files.py')
| -rw-r--r-- | pym/portage/_sets/files.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py index f19ecf6ce..b891ea4f4 100644 --- a/pym/portage/_sets/files.py +++ b/pym/portage/_sets/files.py @@ -1,4 +1,4 @@ -# Copyright 2007-2011 Gentoo Foundation +# Copyright 2007-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import errno @@ -11,7 +11,6 @@ from portage import _unicode_decode from portage import _unicode_encode from portage.util import grabfile, write_atomic, ensure_dirs, normalize_path from portage.const import USER_CONFIG_PATH, WORLD_FILE, WORLD_SETS_FILE -from portage.const import _ENABLE_SET_CONFIG from portage.localization import _ from portage.locks import lockfile, unlockfile from portage import portage_gid @@ -231,9 +230,8 @@ class WorldSelectedSet(EditablePackageSet): write_atomic(self._filename, "".join(sorted("%s\n" % x for x in self._atoms))) - if _ENABLE_SET_CONFIG: - write_atomic(self._filename2, - "".join(sorted("%s\n" % x for x in self._nonatoms))) + write_atomic(self._filename2, + "".join(sorted("%s\n" % x for x in self._nonatoms))) def load(self): atoms = [] @@ -263,9 +261,8 @@ class WorldSelectedSet(EditablePackageSet): else: atoms.extend(self._atoms) - if _ENABLE_SET_CONFIG: - changed2, nonatoms = self._load2() - atoms_changed |= changed2 + changed2, nonatoms = self._load2() + atoms_changed |= changed2 if atoms_changed: self._setAtoms(atoms+nonatoms) |