diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-06 07:36:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-06 07:36:42 +0000 |
| commit | b87ff97f05d7809942262b1fe535d3aef2e8441d (patch) | |
| tree | 2bc628b994c907c8a0f05502720eef13c032a823 | |
| parent | f3b3a7b69d70a9e4ac34a5b3a864021595adece5 (diff) | |
| download | portage-b87ff97f05d7809942262b1fe535d3aef2e8441d.tar.gz portage-b87ff97f05d7809942262b1fe535d3aef2e8441d.tar.bz2 portage-b87ff97f05d7809942262b1fe535d3aef2e8441d.zip | |
Remove ACCEPT_KEYWORDS from incrementals to that a hypothetical config.regenerate() call won't affect it.
svn path=/main/trunk/; revision=4415
| -rwxr-xr-x | bin/repoman | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman index 2da6bea86..0c45724bd 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1130,6 +1130,13 @@ for x in scanlist: config_profile_path=profdir, config_incrementals=portage_const.INCREMENTALS) arch_caches[prof[0]] = dep_settings + while True: + try: + # Protect ACCEPT_KEYWORDS from config.regenerate() + # (just in case) + dep_settings.incrementals.remove("ACCEPT_KEYWORDS") + except ValueError: + break trees["/"]["porttree"].settings = dep_settings portdb.mysettings = dep_settings |