diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-10-25 01:35:31 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-10-25 01:45:22 -0700 |
commit | 10b6d0129d062f4d5d8a7611023c3f8cc43f1eab (patch) | |
tree | 840851adbd0f61a807311444b845244b25cf5492 /pym/portage/const.py | |
parent | 978f3c6d514f0fcf9329d536cc43cf1230e23112 (diff) | |
download | portage-10b6d0129d062f4d5d8a7611023c3f8cc43f1eab.tar.gz portage-10b6d0129d062f4d5d8a7611023c3f8cc43f1eab.tar.bz2 portage-10b6d0129d062f4d5d8a7611023c3f8cc43f1eab.zip |
Add FEATURES=merge-sync, for bug #439584.
Diffstat (limited to 'pym/portage/const.py')
-rw-r--r-- | pym/portage/const.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 3242861cf..8c5bbf308 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -96,6 +96,7 @@ SUPPORTED_FEATURES = frozenset([ "downgrade-backup", "ebuild-locks", "fakeroot", "fail-clean", "force-mirror", "force-prefix", "getbinpkg", "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror", + "merge-sync", "metadata-transfer", "mirror", "multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip", "notitles", "parallel-fetch", "parallel-install", |