| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-11 18:46:50 +0000 (Fri, 11 Apr 2008) |
| 3 |
New Revision: 9832 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
In config.setcpv() and load_infodir(), always set known good values |
| 9 |
for CATEGORY and PF, since corruption of these can cause problems. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2008-04-11 11:27:18 UTC (rev 9831) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2008-04-11 18:46:50 UTC (rev 9832) |
| 16 |
@@ -1818,6 +1818,13 @@ |
| 17 |
os.path.join(infodir, "CATEGORY"), noiselevel=-1) |
| 18 |
self.configdict["pkg"].update(backup_pkg_metadata) |
| 19 |
retval = 0 |
| 20 |
+ |
| 21 |
+ # Always set known good values for these variables, since |
| 22 |
+ # corruption of these can cause problems: |
| 23 |
+ cat, pf = catsplit(self.mycpv) |
| 24 |
+ self.configdict["pkg"]["CATEGORY"] = cat |
| 25 |
+ self.configdict["pkg"]["PF"] = pf |
| 26 |
+ |
| 27 |
return retval |
| 28 |
|
| 29 |
def setcpv(self, mycpv, use_cache=1, mydb=None): |
| 30 |
@@ -1955,8 +1962,13 @@ |
| 31 |
# Without this conditional, regenerate() would be called |
| 32 |
# *every* time. |
| 33 |
has_changed = True |
| 34 |
- # CATEGORY is essential for doebuild calls |
| 35 |
- self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0] |
| 36 |
+ |
| 37 |
+ # Always set known good values for these variables, since |
| 38 |
+ # corruption of these can cause problems: |
| 39 |
+ cat, pf = catsplit(self.mycpv) |
| 40 |
+ self.configdict["pkg"]["CATEGORY"] = cat |
| 41 |
+ self.configdict["pkg"]["PF"] = pf |
| 42 |
+ |
| 43 |
if has_changed: |
| 44 |
self.reset(keeping_pkg=1,use_cache=use_cache) |
| 45 |
|
| 46 |
|
| 47 |
-- |
| 48 |
gentoo-commits@l.g.o mailing list |
Archives