portage.const: restore two dropped features
authorMike Frysinger <vapier@gentoo.org>
Sat, 30 Nov 2013 18:15:33 +0000 (13:15 -0500)
committerMike Frysinger <vapier@gentoo.org>
Sat, 30 Nov 2013 18:15:33 +0000 (13:15 -0500)
The script used to clean this up accidentally dropped two features.

Reported-by: Sebastian Luther <SebastianLuther@gmx.de>
pym/portage/const.py

index a19728bf7dcdc1e1100558efe1e8dbc9cbaf3f99..1785bfff79ff18dbfb5a8a6a4f914270c6ea0322 100644 (file)
@@ -150,6 +150,7 @@ SUPPORTED_FEATURES       = frozenset([
        "keeptemp",
        "keepwork",
        "lmirror",
+       "merge-sync",
        "metadata-transfer",
        "mirror",
        "multilib-strict",
@@ -184,6 +185,7 @@ SUPPORTED_FEATURES       = frozenset([
        "test-fail-continue",
        "unknown-features-filter",
        "unknown-features-warn",
+       "unmerge-backup",
        "unmerge-logs",
        "unmerge-orphans",
        "userfetch",