Call dep_settings.setcpv() first so that ACCEPT_KEYWORDS when setcpv calls reset...

svn path=/main/trunk/; revision=4414

diff --git a/bin/repoman b/bin/repoman
index 148cd945cca131284544923aba394a6ff5b60e79..2da6bea86d17e68632e8a505d04b115325394e0c 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1133,11 +1133,11 @@ for x in scanlist:
 
                                trees["/"]["porttree"].settings = dep_settings
                                portdb.mysettings = dep_settings
+                               # for package.use.mask support inside dep_check
+                               dep_settings.setcpv("/".join((catdir, y)))
                                dep_settings["ACCEPT_KEYWORDS"] = " ".join(groups)
                                # just in case, prevent config.reset() from nuking these.
                                dep_settings.backup_changes("ACCEPT_KEYWORDS")
-                               # for package.use.mask support inside dep_check
-                               dep_settings.setcpv("/".join((catdir, y)))
 
                                for myprovide in myaux["PROVIDE"].split():
                                        prov_cp = portage.dep_getkey(myprovide)