236207 2008-08-30 13:45 0000 Patch to change some cases of hardcoded colors to color.map 2008-12-05 02:49:28 0000 1 1 1 Unclassified Portage Development Core - Interface (emerge) unspecified All All RESOLVED FIXED InSVN P2 trivial --- 210077 216231 1 sevakda@gmail.com dev-portage@gentoo.org sevakda@gmail.com 2008-08-30 13:45:53 0000 I fiddled with color.map for a bit and understood that some messages (some of which occur quite often) are not affected by the settings in it. This patch fixes some of such cases. I wasn't sure about fixing others, because (in my opinion) they would require adding new settings into color.map, which I'm too unsure to do. Reproducible: Always sevakda@gmail.com 2008-08-30 13:50:07 0000 Created an attachment (id=164121) The patch. zmedico@gentoo.org 2008-11-15 06:51:38 0000 Thanks, this is in svn r11935. zmedico@gentoo.org 2008-11-22 05:51:10 0000 This is fixed in 2.2_rc15. 164121 2008-08-30 13:50 0000 The patch. emerge-color.diff text/plain LS0tIGVtZXJnZS5vbGQJMjAwOC0wOC0zMCAxNzoyOTo0MC4wMDAwMDAwMDAgKzA0MDAKKysrIC91 c3IvYmluL2VtZXJnZQkyMDA4LTA4LTMwIDE3OjM2OjExLjAwMDAwMDAwMCArMDQwMApAQCAtMjEy Myw4ICsyMTIzLDggQEAKIAkJeGluZm8gPSB4aW5mby5yZXBsYWNlKCJudWxsLyIsICIiKQogCQlp ZiBteXBhcmVudDoKIAkJCXhmcm9tID0gJyhkZXBlbmRlbmN5IHJlcXVpcmVkIGJ5ICcrIFwKLQkJ CQlncmVlbignIiVzIicgJSBteXBhcmVudFsyXSkgKyBcCi0JCQkJcmVkKCcgWyVzXScgJSBteXBh cmVudFswXSkgKyAnKScKKwkJCQljb2xvcml6ZSgiR09PRCIsJyIlcyInICUgbXlwYXJlbnRbMl0p ICsgXAorCQkJCWNvbG9yaXplKCJCQUQiLCcgWyVzXScgJSBteXBhcmVudFswXSkgKyAnKScKIAkJ bWFza2VkX3BhY2thZ2VzID0gW10KIAkJbWlzc2luZ19saWNlbnNlcyA9IFtdCiAJCWhhdmVfZWFw aV9tYXNrID0gRmFsc2UKQEAgLTIxNTksNyArMjE1OSw3IEBACiAJCQkJCShyb290X2NvbmZpZywg cGtnc2V0dGluZ3MsIGNwdiwgbWV0YWRhdGEsIG1yZWFzb25zKSkKIAogCQlpZiBtYXNrZWRfcGFj a2FnZXM6Ci0JCQlwcmludCAiXG4hISEgIityZWQoIkFsbCBlYnVpbGRzIHRoYXQgY291bGQgc2F0 aXNmeSAiKStncmVlbih4aW5mbykrcmVkKCIgaGF2ZSBiZWVuIG1hc2tlZC4iKQorCQkJcHJpbnQg IlxuISEhICIrY29sb3JpemUoIkJBRCIsIkFsbCBlYnVpbGRzIHRoYXQgY291bGQgc2F0aXNmeSAi KStncmVlbih4aW5mbykrY29sb3JpemUoIkJBRCIsIiBoYXZlIGJlZW4gbWFza2VkLiIpCiAJCQlw cmludCAiISEhIE9uZSBvZiB0aGUgZm9sbG93aW5nIG1hc2tlZCBwYWNrYWdlcyBpcyByZXF1aXJl ZCB0byBjb21wbGV0ZSB5b3VyIHJlcXVlc3Q6IgogCQkJaGF2ZV9lYXBpX21hc2sgPSBzaG93X21h c2tlZF9wYWNrYWdlcyhtYXNrZWRfcGFja2FnZXMpCiAJCQlpZiBoYXZlX2VhcGlfbWFzazoKQEAg LTQ3NzIsOSArNDc3Miw5IEBACiAJCQkJCQlyZWdlbl9pbmZvZGlycy5hcHBlbmQoaW5mb3Jvb3Qp CiAKIAkJaWYgbm90IHJlZ2VuX2luZm9kaXJzOgotCQkJcG9ydGFnZS53cml0ZW1zZ19zdGRvdXQo IiAiK2dyZWVuKCIqIikrIiBHTlUgaW5mbyBkaXJlY3RvcnkgaW5kZXggaXMgdXAtdG8tZGF0ZS5c biIpCisJCQlwb3J0YWdlLndyaXRlbXNnX3N0ZG91dCgiICIrY29sb3JpemUoIkdPT0QiLCIqIikr IiBHTlUgaW5mbyBkaXJlY3RvcnkgaW5kZXggaXMgdXAtdG8tZGF0ZS5cbiIpCiAJCWVsc2U6Ci0J CQlwb3J0YWdlLndyaXRlbXNnX3N0ZG91dCgiICIrZ3JlZW4oIioiKSsiIFJlZ2VuZXJhdGluZyBH TlUgaW5mbyBkaXJlY3RvcnkgaW5kZXguLi5cbiIpCisJCQlwb3J0YWdlLndyaXRlbXNnX3N0ZG91 dCgiICIrY29sb3JpemUoIkdPT0QiLCIqIikrIiBSZWdlbmVyYXRpbmcgR05VIGluZm8gZGlyZWN0 b3J5IGluZGV4Li4uXG4iKQogCiAJCQlkaXJfZXh0ZW5zaW9ucyA9ICgiIiwgIi5neiIsICIuYnoy IikKIAkJCWljb3VudD0wCkBAIC00ODU1LDExICs0ODU1LDExIEBACiAJCQkJcHJldl9tdGltZXNb aW5mb3Jvb3RdID0gbG9uZyhvcy5zdGF0KGluZm9yb290KS5zdF9tdGltZSkKIAogCQkJaWYgYmFk Y291bnQ6Ci0JCQkJcHJpbnQgIiAiK3llbGxvdygiKiIpKyIgUHJvY2Vzc2VkIixpY291bnQsImlu Zm8gZmlsZXM7IixiYWRjb3VudCwiZXJyb3JzLiIKKwkJCQlwcmludCAiICIrY29sb3JpemUoIldB Uk4iLCIqIikrIiBQcm9jZXNzZWQiLGljb3VudCwiaW5mbyBmaWxlczsiLGJhZGNvdW50LCJlcnJv cnMuIgogCQkJCXByaW50IGVycm1zZwogCQkJZWxzZToKIAkJCQlpZiBpY291bnQgPiAwOgotCQkJ CQlwcmludCAiICIrZ3JlZW4oIioiKSsiIFByb2Nlc3NlZCIsaWNvdW50LCJpbmZvIGZpbGVzLiIK KwkJCQkJcHJpbnQgIiAiK2NvbG9yaXplKCJHT09EIiwiKiIpKyIgUHJvY2Vzc2VkIixpY291bnQs ImluZm8gZmlsZXMuIgogCiAKIGRlZiBwb3N0X2VtZXJnZShzZXR0aW5ncywgbXRpbWVkYiwgcmV0 dmFsKToKQEAgLTUzNDAsMjMgKzUzNDAsMjMgQEAKIAkJZWxpZiAoZXhpdGNvZGU+MCk6CiAJCQlw cmludAogCQkJaWYgZXhpdGNvZGU9PTE6Ci0JCQkJcHJpbnQgZGFya3JlZCgiISEhIikrZ3JlZW4o IiBSc3luYyBoYXMgcmVwb3J0ZWQgdGhhdCB0aGVyZSBpcyBhIHN5bnRheCBlcnJvci4gUGxlYXNl IGVuc3VyZSIpCi0JCQkJcHJpbnQgZGFya3JlZCgiISEhIikrZ3JlZW4oIiB0aGF0IHlvdXIgU1lO QyBzdGF0ZW1lbnQgaXMgcHJvcGVyLiIpCi0JCQkJcHJpbnQgZGFya3JlZCgiISEhIikrZ3JlZW4o IiBTWU5DPSIrc2V0dGluZ3NbIlNZTkMiXSkKKwkJCQlwcmludCBjb2xvcml6ZSgiQkFEIiwiISEh IikrZ3JlZW4oIiBSc3luYyBoYXMgcmVwb3J0ZWQgdGhhdCB0aGVyZSBpcyBhIHN5bnRheCBlcnJv ci4gUGxlYXNlIGVuc3VyZSIpCisJCQkJcHJpbnQgY29sb3JpemUoIkJBRCIsIiEhISIpK2dyZWVu KCIgdGhhdCB5b3VyIFNZTkMgc3RhdGVtZW50IGlzIHByb3Blci4iKQorCQkJCXByaW50IGNvbG9y aXplKCJCQUQiLCIhISEiKStncmVlbigiIFNZTkM9IitzZXR0aW5nc1siU1lOQyJdKQogCQkJZWxp ZiBleGl0Y29kZT09MTE6Ci0JCQkJcHJpbnQgZGFya3JlZCgiISEhIikrZ3JlZW4oIiBSc3luYyBo YXMgcmVwb3J0ZWQgdGhhdCB0aGVyZSBpcyBhIEZpbGUgSU8gZXJyb3IuIE5vcm1hbGx5IikKLQkJ CQlwcmludCBkYXJrcmVkKCIhISEiKStncmVlbigiIHRoaXMgbWVhbnMgeW91ciBkaXNrIGlzIGZ1 bGwsIGJ1dCBjYW4gYmUgY2F1c2VkIGJ5IGNvcnJ1cHRpb24iKQotCQkJCXByaW50IGRhcmtyZWQo IiEhISIpK2dyZWVuKCIgb24gdGhlIGZpbGVzeXN0ZW0gdGhhdCBjb250YWlucyBQT1JURElSLiBQ bGVhc2UgaW52ZXN0aWdhdGUiKQotCQkJCXByaW50IGRhcmtyZWQoIiEhISIpK2dyZWVuKCIgYW5k IHRyeSBhZ2FpbiBhZnRlciB0aGUgcHJvYmxlbSBoYXMgYmVlbiBmaXhlZC4iKQotCQkJCXByaW50 IGRhcmtyZWQoIiEhISIpK2dyZWVuKCIgUE9SVERJUj0iK3NldHRpbmdzWyJQT1JURElSIl0pCisJ CQkJcHJpbnQgY29sb3JpemUoIkJBRCIsIiEhISIpK2dyZWVuKCIgUnN5bmMgaGFzIHJlcG9ydGVk IHRoYXQgdGhlcmUgaXMgYSBGaWxlIElPIGVycm9yLiBOb3JtYWxseSIpCisJCQkJcHJpbnQgY29s b3JpemUoIkJBRCIsIiEhISIpK2dyZWVuKCIgdGhpcyBtZWFucyB5b3VyIGRpc2sgaXMgZnVsbCwg YnV0IGNhbiBiZSBjYXVzZWQgYnkgY29ycnVwdGlvbiIpCisJCQkJcHJpbnQgY29sb3JpemUoIkJB RCIsIiEhISIpK2dyZWVuKCIgb24gdGhlIGZpbGVzeXN0ZW0gdGhhdCBjb250YWlucyBQT1JURElS LiBQbGVhc2UgaW52ZXN0aWdhdGUiKQorCQkJCXByaW50IGNvbG9yaXplKCJCQUQiLCIhISEiKStn cmVlbigiIGFuZCB0cnkgYWdhaW4gYWZ0ZXIgdGhlIHByb2JsZW0gaGFzIGJlZW4gZml4ZWQuIikK KwkJCQlwcmludCBjb2xvcml6ZSgiQkFEIiwiISEhIikrZ3JlZW4oIiBQT1JURElSPSIrc2V0dGlu Z3NbIlBPUlRESVIiXSkKIAkJCWVsaWYgZXhpdGNvZGU9PTIwOgotCQkJCXByaW50IGRhcmtyZWQo IiEhISIpK2dyZWVuKCIgUnN5bmMgd2FzIGtpbGxlZCBiZWZvcmUgaXQgZmluaXNoZWQuIikKKwkJ CQlwcmludCBjb2xvcml6ZSgiQkFEIiwiISEhIikrZ3JlZW4oIiBSc3luYyB3YXMga2lsbGVkIGJl Zm9yZSBpdCBmaW5pc2hlZC4iKQogCQkJZWxzZToKLQkJCQlwcmludCBkYXJrcmVkKCIhISEiKStn cmVlbigiIFJzeW5jIGhhcyBub3Qgc3VjY2Vzc2Z1bGx5IGZpbmlzaGVkLiBJdCBpcyByZWNvbW1l bmRlZCB0aGF0IHlvdSBrZWVwIikKLQkJCQlwcmludCBkYXJrcmVkKCIhISEiKStncmVlbigiIHRy eWluZyBvciB0aGF0IHlvdSB1c2UgdGhlICdlbWVyZ2Utd2VicnN5bmMnIG9wdGlvbiBpZiB5b3Ug YXJlIHVuYWJsZSIpCi0JCQkJcHJpbnQgZGFya3JlZCgiISEhIikrZ3JlZW4oIiB0byB1c2UgcnN5 bmMgZHVlIHRvIGZpcmV3YWxsIG9yIG90aGVyIHJlc3RyaWN0aW9ucy4gVGhpcyBzaG91bGQgYmUg YSIpCi0JCQkJcHJpbnQgZGFya3JlZCgiISEhIikrZ3JlZW4oIiB0ZW1wb3JhcnkgcHJvYmxlbSB1 bmxlc3MgY29tcGxpY2F0aW9ucyBleGlzdCB3aXRoIHlvdXIgbmV0d29yayIpCi0JCQkJcHJpbnQg ZGFya3JlZCgiISEhIikrZ3JlZW4oIiAoYW5kIHBvc3NpYmx5IHlvdXIgc3lzdGVtJ3MgZmlsZXN5 c3RlbSkgY29uZmlndXJhdGlvbi4iKQorCQkJCXByaW50IGNvbG9yaXplKCJCQUQiLCIhISEiKStn cmVlbigiIFJzeW5jIGhhcyBub3Qgc3VjY2Vzc2Z1bGx5IGZpbmlzaGVkLiBJdCBpcyByZWNvbW1l bmRlZCB0aGF0IHlvdSBrZWVwIikKKwkJCQlwcmludCBjb2xvcml6ZSgiQkFEIiwiISEhIikrZ3Jl ZW4oIiB0cnlpbmcgb3IgdGhhdCB5b3UgdXNlIHRoZSAnZW1lcmdlLXdlYnJzeW5jJyBvcHRpb24g aWYgeW91IGFyZSB1bmFibGUiKQorCQkJCXByaW50IGNvbG9yaXplKCJCQUQiLCIhISEiKStncmVl bigiIHRvIHVzZSByc3luYyBkdWUgdG8gZmlyZXdhbGwgb3Igb3RoZXIgcmVzdHJpY3Rpb25zLiBU aGlzIHNob3VsZCBiZSBhIikKKwkJCQlwcmludCBjb2xvcml6ZSgiQkFEIiwiISEhIikrZ3JlZW4o IiB0ZW1wb3JhcnkgcHJvYmxlbSB1bmxlc3MgY29tcGxpY2F0aW9ucyBleGlzdCB3aXRoIHlvdXIg bmV0d29yayIpCisJCQkJcHJpbnQgY29sb3JpemUoIkJBRCIsIiEhISIpK2dyZWVuKCIgKGFuZCBw b3NzaWJseSB5b3VyIHN5c3RlbSdzIGZpbGVzeXN0ZW0pIGNvbmZpZ3VyYXRpb24uIikKIAkJCXBy aW50CiAJCQlzeXMuZXhpdChleGl0Y29kZSkKIAllbGlmIHN5bmN1cmlbOjZdPT0iY3ZzOi8vIjoK