170795 2007-03-13 22:27 0000 app-portage/portage-utils - add a -E/--eclass option to qgrep 2007-04-05 18:43:02 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All Linux RESOLVED FIXED InCVS P2 enhancement --- 1 tom.gl@free.fr portage-utils@gentoo.org samuel.lethiec@intelunix.fr tom.gl@free.fr 2007-03-13 22:27:26 0000 Here is a patch which adds an --eclass option, which makes qgrep search in eclasses instead of ebuilds. tom.gl@free.fr 2007-03-13 22:28:35 0000 Created an attachment (id=113220) qgrep--add_eclass_option.patch solar@gentoo.org 2007-03-16 22:18:01 0000 The new -E option does not print the path relative to $PORTDIR for the matching eclass. tom.gl@free.fr 2007-03-17 08:36:39 0000 (In reply to comment #2) > The new -E option does not print the path relative to $PORTDIR for the matching > eclass. > Ok, a new patch follows which changes that (now prints "eclass/foo.eclass"). It is also a bit shorter, since it reuses the "ebuild" local var for eclass file paths, instead of adding a new one. And finally it adds a closedir() that was missing. solar@gentoo.org 2007-03-17 16:14:11 0000 (In reply to comment #3) .. > Ok, a new patch follows which changes that (now prints "eclass/foo.eclass"). Did you forget to attach the patch? tom.gl@free.fr 2007-03-17 16:32:04 0000 Created an attachment (id=113578) qgrep--add_eclass_option.patch Ooops... solar@gentoo.org 2007-03-17 20:32:12 0000 /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v <-- qgrep.c new revision: 1.16; previous revision: 1.15 solar@gentoo.org 2007-04-05 18:42:18 0000 This is released in 0.1.25 Bug #168334 ; q -r dies with a segfault after emerge --sync Bug #168442 ; does not properly parse the profile location Bug #170795 ; add a -E/--eclass option to qgrep Bug #170797 ; add a -s/--skip-comments option to qgrep Bug #171024 ; opening '/usr/portage/.metadata.x' failed Bug #171374 ; Misc enhancements for qgrep Bug #172240 ; -A/-B options for qgrep (context lines) Bug #172338 ; qgrepping through installed ebuilds (in the VDB) Bug #173005 ; Colorized output for qgrep. solar@gentoo.org 2007-04-05 18:43:02 0000 Closing 113220 2007-03-13 22:28 0000 qgrep--add_eclass_option.patch qgrep--add_eclass_option.patch text/plain SW5kZXg6IHFncmVwLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3Zhci9jdnNyb290L2dlbnRvby1w cm9qZWN0cy9wb3J0YWdlLXV0aWxzL3FncmVwLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTUK ZGlmZiAtdSAtcjEuMTUgcWdyZXAuYwotLS0gcWdyZXAuYwk5IE5vdiAyMDA2IDAwOjE4OjA1IC0w MDAwCTEuMTUKKysrIHFncmVwLmMJMTMgTWFyIDIwMDcgMjI6Mzk6MTMgLTAwMDAKQEAgLTEwLDEz ICsxMCwxNCBAQAogCiAjaWZkZWYgQVBQTEVUX3FncmVwCiAKLSNkZWZpbmUgUUdSRVBfRkxBR1Mg IklpSGNlIiBDT01NT05fRkxBR1MKKyNkZWZpbmUgUUdSRVBfRkxBR1MgIklpSGNlRSIgQ09NTU9O X0ZMQUdTCiBzdGF0aWMgc3RydWN0IG9wdGlvbiBjb25zdCBxZ3JlcF9sb25nX29wdHNbXSA9IHsK IAl7ImludmVydC1tYXRjaCIsICBub19hcmd1bWVudCwgTlVMTCwgJ0knfSwKIAl7Imlnbm9yZS1j YXNlIiwgICBub19hcmd1bWVudCwgTlVMTCwgJ2knfSwKIAl7IndpdGgtZmlsZW5hbWUiLCBub19h cmd1bWVudCwgTlVMTCwgJ0gnfSwKIAl7ImNvdW50IiwgICAgICAgICBub19hcmd1bWVudCwgTlVM TCwgJ2MnfSwKIAl7InJlZ2V4cCIsICAgICAgICBub19hcmd1bWVudCwgTlVMTCwgJ2UnfSwKKwl7 ImVjbGFzcyIsICAgICAgICBub19hcmd1bWVudCwgTlVMTCwgJ0UnfSwKIAlDT01NT05fTE9OR19P UFRTCiB9Owogc3RhdGljIGNvbnN0IGNoYXIgKnFncmVwX29wdHNfaGVscFtdID0gewpAQCAtMjUs NiArMjYsNyBAQAogCSJQcmludCB0aGUgZmlsZW5hbWUgZm9yIGVhY2ggbWF0Y2giLAogCSJPbmx5 IHByaW50IGEgY291bnQgb2YgbWF0Y2hpbmcgbGluZXMgcGVyIEZJTEUiLAogCSJVc2UgUEFUVEVS TiBhcyBhIHJlZ3VsYXIgZXhwcmVzc2lvbiIsCisJIlNlYXJjaCBpbiBlY2xhc3NlcyBpbnN0ZWFk IG9mIGVidWlsZHMiLAogCUNPTU1PTl9PUFRTX0hFTFAKIH07CiBzdGF0aWMgY29uc3QgY2hhciBx Z3JlcF9yY3NpZFtdID0gIiRJZDogcWdyZXAuYyx2IDEuMTUgMjAwNi8xMS8wOSAwMDoxODowNSB2 YXBpZXIgRXhwICQiOwpAQCAtMzUsMTAgKzM3LDEzIEBACiAJaW50IGk7CiAJaW50IGNvdW50ID0g MDsKIAljaGFyICpwOwotCWNoYXIgZG9fY291bnQsIGRvX3JlZ2V4OworCWNoYXIgZG9fY291bnQs IGRvX3JlZ2V4LCBkb19lY2xhc3M7CiAJY2hhciBzaG93X2ZpbGVuYW1lOwotCUZJTEUgKmZwOwor CUZJTEUgKmZwID0gTlVMTDsKKwlESVIgKmVjbGFzc19kaXIgPSBOVUxMOworCXN0cnVjdCBkaXJl bnQgKmRlbnRyeTsKIAljaGFyIGVidWlsZFtfUV9QQVRIX01BWF07CisJY2hhciAqZWNsYXNzID0g TlVMTDsKIAljaGFyIGJ1ZjBbQlVGU0laXTsKIAlpbnQgcmVmbGFncyA9IFJFR19OT1NVQjsKIAlj aGFyIGludmVydF9tYXRjaCA9IDA7CkBAIC00OSw3ICs1NCw3IEBACiAJREJHKCJhcmdjPSVkIGFy Z3ZbMF09JXMgYXJndlsxXT0lcyIsCiAJICAgIGFyZ2MsIGFyZ3ZbMF0sIGFyZ2MgPiAxID8gYXJn dlsxXSA6ICJOVUxMPyIpOwogCi0JZG9fY291bnQgPSBkb19yZWdleCA9IHNob3dfZmlsZW5hbWUg PSAwOworCWRvX2NvdW50ID0gZG9fcmVnZXggPSBkb19lY2xhc3MgPSBzaG93X2ZpbGVuYW1lID0g MDsKIAogCXdoaWxlICgoaSA9IEdFVE9QVF9MT05HKFFHUkVQLCBxZ3JlcCwgIiIpKSAhPSAtMSkg ewogCQlzd2l0Y2ggKGkpIHsKQEAgLTYwLDYgKzY1LDcgQEAKIAkJCWJyZWFrOwogCQljYXNlICdj JzogZG9fY291bnQgPSAxOyBicmVhazsKIAkJY2FzZSAnZSc6IGRvX3JlZ2V4ID0gMTsgYnJlYWs7 CisJCWNhc2UgJ0UnOiBkb19lY2xhc3MgPSAxOyBicmVhazsKIAkJY2FzZSAnSCc6IHNob3dfZmls ZW5hbWUgPSAxOyBicmVhazsKIAkJQ09NTU9OX0dFVE9QVFNfQ0FTRVMocWdyZXApCiAJCX0KQEAg LTY3LDE1ICs3MywzMSBAQAogCWlmIChhcmdjID09IG9wdGluZCkKIAkJcWdyZXBfdXNhZ2UoRVhJ VF9GQUlMVVJFKTsKIAotCWluaXRpYWxpemVfZWJ1aWxkX2ZsYXQoKTsJLyogc2V0cyBvdXIgcHdk IHRvICRQT1JURElSICovCisJaWYgKCFkb19lY2xhc3MpIHsKKwkJaW5pdGlhbGl6ZV9lYnVpbGRf ZmxhdCgpOwkvKiBzZXRzIG91ciBwd2QgdG8gJFBPUlRESVIgKi8KKwkJaWYgKChmcCA9IGZvcGVu KENBQ0hFX0VCVUlMRF9GSUxFLCAiciIpKSA9PSBOVUxMKQorCQkJcmV0dXJuIDE7CisJfSBlbHNl IHsKKwkJaWYgKChjaGRpcihwb3J0ZGlyKSkgIT0gMCkKKwkJCWVycnAoImNoZGlyIHRvIFBPUlRE SVIgJyVzJyBmYWlsZWQiLCBwb3J0ZGlyKTsKKwkJaWYgKChjaGRpcigiZWNsYXNzIikpICE9IDAp CisJCQllcnJwKCJjaGRpciB0byAnJXMvZWNsYXNzJyBmYWlsZWQiLCBwb3J0ZGlyKTsKKwkJaWYg KChlY2xhc3NfZGlyID0gb3BlbmRpcigiLiIpKSA9PSBOVUxMKQorCQkJZXJycCgib3BlbmRpcihc IiVzL2VjbGFzc1wiKSBmYWlsZWQiLCBwb3J0ZGlyKTsKKwl9CiAKLQlpZiAoKGZwID0gZm9wZW4o Q0FDSEVfRUJVSUxEX0ZJTEUsICJyIikpID09IE5VTEwpCi0JCXJldHVybiAxOwotCXdoaWxlICgo ZmdldHMoZWJ1aWxkLCBzaXplb2YoZWJ1aWxkKSwgZnApKSAhPSBOVUxMKSB7CisJd2hpbGUgKGRv X2VjbGFzcworCQkJPyAoKGRlbnRyeSA9IHJlYWRkaXIoZWNsYXNzX2RpcikpICYmIChlY2xhc3Mg PSBkZW50cnktPmRfbmFtZSkpCisJCQk6ICgoZmdldHMoZWJ1aWxkLCBzaXplb2YoZWJ1aWxkKSwg ZnApKSAhPSBOVUxMKSkgewogCQlGSUxFICpuZXdmcDsKLQkJaWYgKChwID0gc3RyY2hyKGVidWls ZCwgJ1xuJykpICE9IE5VTEwpCi0JCQkqcCA9IDA7Ci0JCWlmICgobmV3ZnAgPSBmb3BlbihlYnVp bGQsICJyIikpICE9IE5VTEwpIHsKKwkJaWYgKGRvX2VjbGFzcykgeworCQkJaWYgKChwID0gc3Ry cmNocihlY2xhc3MsICcuJykpID09IE5VTEwpCisJCQkJY29udGludWU7CisJCQlpZiAoc3RyY21w KHAsICIuZWNsYXNzIikpCisJCQkJY29udGludWU7CisJCX0gZWxzZSBpZiAoKHAgPSBzdHJjaHIo ZWJ1aWxkLCAnXG4nKSkgIT0gTlVMTCkKKwkJCQkqcCA9IDA7CisJCWlmICgobmV3ZnAgPSBmb3Bl bigoZG9fZWNsYXNzID8gZWNsYXNzIDogZWJ1aWxkKSwgInIiKSkgIT0gTlVMTCkgewogCQkJdW5z aWduZWQgaW50IGxpbmVubyA9IDA7CiAJCQljb3VudCA9IDA7CiAJCQl3aGlsZSAoKGZnZXRzKGJ1 ZjAsIHNpemVvZihidWYwKSwgbmV3ZnApKSAhPSBOVUxMKSB7CkBAIC0xMDIsNyArMTI0LDcgQEAK IAkJCQljb3VudCsrOwogCQkJCWlmIChkb19jb3VudCkgY29udGludWU7CiAJCQkJaWYgKHZlcmJv c2UgfHwgc2hvd19maWxlbmFtZSkgewotCQkJCQlwcmludGYoIiVzOiIsIGVidWlsZCk7CisJCQkJ CXByaW50ZigiJXM6IiwgKGRvX2VjbGFzcyA/IGVjbGFzcyA6IGVidWlsZCkpOwogCQkJCQlpZiAo dmVyYm9zZSA+IDEpIHByaW50ZigiJWQ6IiwgbGluZW5vKTsKIAkJCQkJcHJpbnRmKCIgIik7CiAJ CQkJfQpAQCAtMTEwLDEzICsxMzIsMTUgQEAKIAkJCX0KIAkJCWZjbG9zZShuZXdmcCk7CiAJCQlp ZiAoZG9fY291bnQgJiYgY291bnQpIHsKLQkJCQlpZiAodmVyYm9zZSB8fCBzaG93X2ZpbGVuYW1l KSBwcmludGYoIiVzOiIsIGVidWlsZCk7CisJCQkJaWYgKHZlcmJvc2UgfHwgc2hvd19maWxlbmFt ZSkKKwkJCQkJcHJpbnRmKCIlczoiLCAoZG9fZWNsYXNzID8gZWNsYXNzIDogZWJ1aWxkKSk7CiAJ CQkJcHJpbnRmKCIlZCIsIGNvdW50KTsKIAkJCQlwdXRzKCIiKTsKIAkJCX0KIAkJfQogCX0KLQlm Y2xvc2UoZnApOworCWlmICghZG9fZWNsYXNzKQorCQlmY2xvc2UoZnApOwogCXJldHVybiBFWElU X1NVQ0NFU1M7CiB9CiAK 113578 2007-03-17 16:32 0000 qgrep--add_eclass_option.patch qgrep--add_eclass_option.patch text/plain SW5kZXg6IHFncmVwLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3Zhci9jdnNyb290L2dlbnRvby1w cm9qZWN0cy9wb3J0YWdlLXV0aWxzL3FncmVwLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTUK ZGlmZiAtdSAtcjEuMTUgcWdyZXAuYwotLS0gcWdyZXAuYwk5IE5vdiAyMDA2IDAwOjE4OjA1IC0w MDAwCTEuMTUKKysrIHFncmVwLmMJMTcgTWFyIDIwMDcgMDg6Mjk6MzYgLTAwMDAKQEAgLTEwLDEz ICsxMCwxNCBAQAogCiAjaWZkZWYgQVBQTEVUX3FncmVwCiAKLSNkZWZpbmUgUUdSRVBfRkxBR1Mg IklpSGNlIiBDT01NT05fRkxBR1MKKyNkZWZpbmUgUUdSRVBfRkxBR1MgIklpSGNlRSIgQ09NTU9O X0ZMQUdTCiBzdGF0aWMgc3RydWN0IG9wdGlvbiBjb25zdCBxZ3JlcF9sb25nX29wdHNbXSA9IHsK IAl7ImludmVydC1tYXRjaCIsICBub19hcmd1bWVudCwgTlVMTCwgJ0knfSwKIAl7Imlnbm9yZS1j YXNlIiwgICBub19hcmd1bWVudCwgTlVMTCwgJ2knfSwKIAl7IndpdGgtZmlsZW5hbWUiLCBub19h cmd1bWVudCwgTlVMTCwgJ0gnfSwKIAl7ImNvdW50IiwgICAgICAgICBub19hcmd1bWVudCwgTlVM TCwgJ2MnfSwKIAl7InJlZ2V4cCIsICAgICAgICBub19hcmd1bWVudCwgTlVMTCwgJ2UnfSwKKwl7 ImVjbGFzcyIsICAgICAgICBub19hcmd1bWVudCwgTlVMTCwgJ0UnfSwKIAlDT01NT05fTE9OR19P UFRTCiB9Owogc3RhdGljIGNvbnN0IGNoYXIgKnFncmVwX29wdHNfaGVscFtdID0gewpAQCAtMjUs NSArMjYsNiBAQAogCSJQcmludCB0aGUgZmlsZW5hbWUgZm9yIGVhY2ggbWF0Y2giLAogCSJPbmx5 IHByaW50IGEgY291bnQgb2YgbWF0Y2hpbmcgbGluZXMgcGVyIEZJTEUiLAogCSJVc2UgUEFUVEVS TiBhcyBhIHJlZ3VsYXIgZXhwcmVzc2lvbiIsCisJIlNlYXJjaCBpbiBlY2xhc3NlcyBpbnN0ZWFk IG9mIGVidWlsZHMiLAogCUNPTU1PTl9PUFRTX0hFTFAKIH07CkBAIC0zNSw5ICszNywxMSBAQAog CWludCBpOwogCWludCBjb3VudCA9IDA7CiAJY2hhciAqcDsKLQljaGFyIGRvX2NvdW50LCBkb19y ZWdleDsKKwljaGFyIGRvX2NvdW50LCBkb19yZWdleCwgZG9fZWNsYXNzOwogCWNoYXIgc2hvd19m aWxlbmFtZTsKLQlGSUxFICpmcDsKKwlGSUxFICpmcCA9IE5VTEw7CisJRElSICplY2xhc3NfZGly ID0gTlVMTDsKKwlzdHJ1Y3QgZGlyZW50ICpkZW50cnk7CiAJY2hhciBlYnVpbGRbX1FfUEFUSF9N QVhdOwogCWNoYXIgYnVmMFtCVUZTSVpdOwogCWludCByZWZsYWdzID0gUkVHX05PU1VCOwpAQCAt NDksNyArNTMsNyBAQAogCURCRygiYXJnYz0lZCBhcmd2WzBdPSVzIGFyZ3ZbMV09JXMiLAogCSAg ICBhcmdjLCBhcmd2WzBdLCBhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiTlVMTD8iKTsKIAotCWRvX2Nv dW50ID0gZG9fcmVnZXggPSBzaG93X2ZpbGVuYW1lID0gMDsKKwlkb19jb3VudCA9IGRvX3JlZ2V4 ID0gZG9fZWNsYXNzID0gc2hvd19maWxlbmFtZSA9IDA7CiAKIAl3aGlsZSAoKGkgPSBHRVRPUFRf TE9ORyhRR1JFUCwgcWdyZXAsICIiKSkgIT0gLTEpIHsKIAkJc3dpdGNoIChpKSB7CkBAIC02MCw2 ICs2NCw3IEBACiAJCQlicmVhazsKIAkJY2FzZSAnYyc6IGRvX2NvdW50ID0gMTsgYnJlYWs7CiAJ CWNhc2UgJ2UnOiBkb19yZWdleCA9IDE7IGJyZWFrOworCQljYXNlICdFJzogZG9fZWNsYXNzID0g MTsgYnJlYWs7CiAJCWNhc2UgJ0gnOiBzaG93X2ZpbGVuYW1lID0gMTsgYnJlYWs7CiAJCUNPTU1P Tl9HRVRPUFRTX0NBU0VTKHFncmVwKQogCQl9CkBAIC02NywxNCArNzIsMjkgQEAKIAlpZiAoYXJn YyA9PSBvcHRpbmQpCiAJCXFncmVwX3VzYWdlKEVYSVRfRkFJTFVSRSk7CiAKLQlpbml0aWFsaXpl X2VidWlsZF9mbGF0KCk7CS8qIHNldHMgb3VyIHB3ZCB0byAkUE9SVERJUiAqLworCWlmICghZG9f ZWNsYXNzKSB7CisJCWluaXRpYWxpemVfZWJ1aWxkX2ZsYXQoKTsJLyogc2V0cyBvdXIgcHdkIHRv ICRQT1JURElSICovCisJCWlmICgoZnAgPSBmb3BlbihDQUNIRV9FQlVJTERfRklMRSwgInIiKSkg PT0gTlVMTCkKKwkJCXJldHVybiAxOworCX0gZWxzZSB7CisJCWlmICgoY2hkaXIocG9ydGRpcikp ICE9IDApCisJCQllcnJwKCJjaGRpciB0byBQT1JURElSICclcycgZmFpbGVkIiwgcG9ydGRpcik7 CisJCWlmICgoZWNsYXNzX2RpciA9IG9wZW5kaXIoImVjbGFzcyIpKSA9PSBOVUxMKQorCQkJZXJy cCgib3BlbmRpcihcIiVzL2VjbGFzc1wiKSBmYWlsZWQiLCBwb3J0ZGlyKTsKKwl9CiAKLQlpZiAo KGZwID0gZm9wZW4oQ0FDSEVfRUJVSUxEX0ZJTEUsICJyIikpID09IE5VTEwpCi0JCXJldHVybiAx OwotCXdoaWxlICgoZmdldHMoZWJ1aWxkLCBzaXplb2YoZWJ1aWxkKSwgZnApKSAhPSBOVUxMKSB7 CisJd2hpbGUgKGRvX2VjbGFzcworCQkJPyAoKGRlbnRyeSA9IHJlYWRkaXIoZWNsYXNzX2Rpcikp CisJCQkJJiYgc25wcmludGYoZWJ1aWxkLCBzaXplb2YoZWJ1aWxkKSwgImVjbGFzcy8lcyIsIGRl bnRyeS0+ZF9uYW1lKSkKKwkJCTogKChmZ2V0cyhlYnVpbGQsIHNpemVvZihlYnVpbGQpLCBmcCkp ICE9IE5VTEwpKSB7CiAJCUZJTEUgKm5ld2ZwOwotCQlpZiAoKHAgPSBzdHJjaHIoZWJ1aWxkLCAn XG4nKSkgIT0gTlVMTCkKLQkJCSpwID0gMDsKKwkJaWYgKGRvX2VjbGFzcykgeworCQkJaWYgKChw ID0gc3RycmNocihlYnVpbGQsICcuJykpID09IE5VTEwpCisJCQkJY29udGludWU7CisJCQlpZiAo c3RyY21wKHAsICIuZWNsYXNzIikpCisJCQkJY29udGludWU7CisJCX0gZWxzZSBpZiAoKHAgPSBz dHJjaHIoZWJ1aWxkLCAnXG4nKSkgIT0gTlVMTCkKKwkJCQkqcCA9IDA7CiAJCWlmICgobmV3ZnAg PSBmb3BlbihlYnVpbGQsICJyIikpICE9IE5VTEwpIHsKIAkJCXVuc2lnbmVkIGludCBsaW5lbm8g PSAwOwogCQkJY291bnQgPSAwOwpAQCAtMTE2LDcgKzEzNiwxMCBAQAogCQkJfQogCQl9CiAJfQot CWZjbG9zZShmcCk7CisJaWYgKGRvX2VjbGFzcykKKwkJY2xvc2VkaXIoZWNsYXNzX2Rpcik7CisJ ZWxzZQorCQlmY2xvc2UoZnApOwogCXJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAK