From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 28 Jun 2007 02:37:18 +0000 (-0000)
Subject: For bug #144333, make the --reinstall option a single choice type. (trunk r7069)
X-Git-Tag: v2.1.3~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e518bcab9ec8e236b333bd6ade79715b335f50e7;p=portage.git

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 4cc102337..d9bde5e11 100755
--- 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"]
 		}
 	}