1 |
commit: 86efbac7054388819a873ee8783439ca1226c5e8 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 30 18:15:33 2013 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 30 18:15:33 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86efbac7 |
7 |
|
8 |
portage.const: restore two dropped features |
9 |
|
10 |
The script used to clean this up accidentally dropped two features. |
11 |
|
12 |
Reported-by: Sebastian Luther <SebastianLuther <AT> gmx.de> |
13 |
|
14 |
--- |
15 |
pym/portage/const.py | 2 ++ |
16 |
1 file changed, 2 insertions(+) |
17 |
|
18 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
19 |
index a19728b..1785bff 100644 |
20 |
--- a/pym/portage/const.py |
21 |
+++ b/pym/portage/const.py |
22 |
@@ -150,6 +150,7 @@ SUPPORTED_FEATURES = frozenset([ |
23 |
"keeptemp", |
24 |
"keepwork", |
25 |
"lmirror", |
26 |
+ "merge-sync", |
27 |
"metadata-transfer", |
28 |
"mirror", |
29 |
"multilib-strict", |
30 |
@@ -184,6 +185,7 @@ SUPPORTED_FEATURES = frozenset([ |
31 |
"test-fail-continue", |
32 |
"unknown-features-filter", |
33 |
"unknown-features-warn", |
34 |
+ "unmerge-backup", |
35 |
"unmerge-logs", |
36 |
"unmerge-orphans", |
37 |
"userfetch", |