| 1 |
commit: 076c6637583328dc814828e1d10affb4e2666368 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 2 22:42:38 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 2 22:46:27 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=076c6637 |
| 7 |
|
| 8 |
treewalk: skip CHOST warning for binary packages |
| 9 |
|
| 10 |
The CHOST of a binary package does not necessarily match the make.conf |
| 11 |
setting, especially if ACCEPT_CHOSTS is configured to match other CHOST |
| 12 |
values. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/portage/dbapi/vartree.py | 5 ++++- |
| 16 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 19 |
index c6eaabf..e1a4753 100644 |
| 20 |
--- a/pym/portage/dbapi/vartree.py |
| 21 |
+++ b/pym/portage/dbapi/vartree.py |
| 22 |
@@ -3555,6 +3555,7 @@ class dblink(object): |
| 23 |
level=logging.ERROR, noiselevel=-1) |
| 24 |
return 1 |
| 25 |
|
| 26 |
+ is_binpkg = self.settings.get("EMERGE_FROM") == "binary" |
| 27 |
slot = '' |
| 28 |
for var_name in ('CHOST', 'SLOT'): |
| 29 |
if var_name == 'CHOST' and self.cat == 'virtual': |
| 30 |
@@ -3588,7 +3589,9 @@ class dblink(object): |
| 31 |
return 1 |
| 32 |
write_atomic(os.path.join(inforoot, var_name), slot + '\n') |
| 33 |
|
| 34 |
- if val != self.settings.get(var_name, ''): |
| 35 |
+ # This check only applies when built from source, since |
| 36 |
+ # inforoot values are written just after src_install. |
| 37 |
+ if not is_binpkg and val != self.settings.get(var_name, ''): |
| 38 |
self._eqawarn('preinst', |
| 39 |
[_("QA Notice: Expected %(var_name)s='%(expected_value)s', got '%(actual_value)s'\n") % \ |
| 40 |
{"var_name":var_name, "expected_value":self.settings.get(var_name, ''), "actual_value":val}]) |
Archives