For bug #144333, make the --reinstall option a single choice type. (trunk r7069)

svn path=/main/branches/2.1.2/; revision=7070

diff --git a/bin/emerge b/bin/emerge
index 4cc1023375c1b7bd106f9e10cce0f8b63517228f..d9bde5e11bcc9339c765f9c371e73e5b47fac707 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1052,7 +1052,7 @@ class depgraph:
                        elif org_iuse.intersection(orig_use) != \
                                cur_iuse.intersection(cur_use):
                                return True
-               elif "changed-use" in self.myopts.get("--reinstall","").split(","):
+               elif "changed-use" == self.myopts.get("--reinstall"):
                        if org_iuse.intersection(orig_use) != \
                                cur_iuse.intersection(cur_use):
                                return True
@@ -5204,7 +5204,9 @@ def parse_opts(tmpcmdline, silent=False):
                        "choices":("y", "n")
                },
                "--reinstall": {
-                       "help":"specify conditions to trigger package reinstallation"
+                       "help":"specify conditions to trigger package reinstallation",
+                       "type":"choice",
+                       "choices":["changed-use"]
                }
        }