170797 2007-03-13 22:38 0000 app-portage/portage-utils - add a -s/--skip-comments option to qgrep 2007-04-05 18:43:03 0000 1 1 1 Unclassified Portage Development Third-Party Tools 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:38:21 0000 Here is a small patch which adds a --skip-comments option to qgrep. It is meant to avoid the "|sed '/\.ebuild:[ \t]*#/d'" i've used a few times (just thought i may not be the only one). The patch applies on top of the one from bug #170795 ("--eclass"). tom.gl@free.fr 2007-03-13 22:38:44 0000 Created an attachment (id=113221) qgrep--add_skip-comments_option.patch tom.gl@free.fr 2007-03-17 08:37:03 0000 Created an attachment (id=113549) qgrep--add_eclass_option.patch tom.gl@free.fr 2007-03-17 19:53:51 0000 (From update of attachment 113221) Bleh... The second patch i've attached here is the one that was missing in bug #170795 :-/ tom.gl@free.fr 2007-03-17 19:54:10 0000 (From update of attachment 113549) wrong bug solar@gentoo.org 2007-03-17 20:53:43 0000 /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v <-- qgrep.c new revision: 1.17; previous revision: 1.16 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:03 0000 Closing 113221 2007-03-13 22:38 0000 qgrep--add_skip-comments_option.patch qgrep--add_skip-comments_option.patch text/plain LS0tIHFncmVwLmMuZWNsYXNzCTIwMDctMDMtMTMgMjM6MDU6MzQuMDAwMDAwMDAwICswMTAwCisr KyBxZ3JlcC5jCTIwMDctMDMtMTMgMjM6MDU6MDEuMDAwMDAwMDAwICswMTAwCkBAIC0xMCw3ICsx MCw3IEBACiAKICNpZmRlZiBBUFBMRVRfcWdyZXAKIAotI2RlZmluZSBRR1JFUF9GTEFHUyAiSWlI Y2VFIiBDT01NT05fRkxBR1MKKyNkZWZpbmUgUUdSRVBfRkxBR1MgIklpSGNlRXMiIENPTU1PTl9G TEFHUwogc3RhdGljIHN0cnVjdCBvcHRpb24gY29uc3QgcWdyZXBfbG9uZ19vcHRzW10gPSB7CiAJ eyJpbnZlcnQtbWF0Y2giLCAgbm9fYXJndW1lbnQsIE5VTEwsICdJJ30sCiAJeyJpZ25vcmUtY2Fz ZSIsICAgbm9fYXJndW1lbnQsIE5VTEwsICdpJ30sCkBAIC0xOCw2ICsxOCw3IEBACiAJeyJjb3Vu dCIsICAgICAgICAgbm9fYXJndW1lbnQsIE5VTEwsICdjJ30sCiAJeyJyZWdleHAiLCAgICAgICAg bm9fYXJndW1lbnQsIE5VTEwsICdlJ30sCiAJeyJlY2xhc3MiLCAgICAgICAgbm9fYXJndW1lbnQs IE5VTEwsICdFJ30sCisJeyJza2lwLWNvbW1lbnRzIiwgbm9fYXJndW1lbnQsIE5VTEwsICdzJ30s CiAJQ09NTU9OX0xPTkdfT1BUUwogfTsKIHN0YXRpYyBjb25zdCBjaGFyICpxZ3JlcF9vcHRzX2hl bHBbXSA9IHsKQEAgLTI3LDUgKzI4LDYgQEAKIAkiT25seSBwcmludCBhIGNvdW50IG9mIG1hdGNo aW5nIGxpbmVzIHBlciBGSUxFIiwKIAkiVXNlIFBBVFRFUk4gYXMgYSByZWd1bGFyIGV4cHJlc3Np b24iLAogCSJTZWFyY2ggaW4gZWNsYXNzZXMgaW5zdGVhZCBvZiBlYnVpbGRzIiwKKwkiU2tpcCBj b21tZW50cyBsaW5lcyIsCiAJQ09NTU9OX09QVFNfSEVMUAogfTsKQEAgLTM4LDcgKzQwLDcgQEAK IAlpbnQgY291bnQgPSAwOwogCWNoYXIgKnA7CiAJY2hhciBkb19jb3VudCwgZG9fcmVnZXgsIGRv X2VjbGFzczsKLQljaGFyIHNob3dfZmlsZW5hbWU7CisJY2hhciBzaG93X2ZpbGVuYW1lLCBza2lw X2NvbW1lbnRzOwogCUZJTEUgKmZwID0gTlVMTDsKIAlESVIgKmVjbGFzc19kaXIgPSBOVUxMOwog CXN0cnVjdCBkaXJlbnQgKmRlbnRyeTsKQEAgLTU0LDcgKzU2LDcgQEAKIAlEQkcoImFyZ2M9JWQg YXJndlswXT0lcyBhcmd2WzFdPSVzIiwKIAkgICAgYXJnYywgYXJndlswXSwgYXJnYyA+IDEgPyBh cmd2WzFdIDogIk5VTEw/Iik7CiAKLQlkb19jb3VudCA9IGRvX3JlZ2V4ID0gZG9fZWNsYXNzID0g c2hvd19maWxlbmFtZSA9IDA7CisJZG9fY291bnQgPSBkb19yZWdleCA9IGRvX2VjbGFzcyA9IHNo b3dfZmlsZW5hbWUgPSBza2lwX2NvbW1lbnRzID0gMDsKIAogCXdoaWxlICgoaSA9IEdFVE9QVF9M T05HKFFHUkVQLCBxZ3JlcCwgIiIpKSAhPSAtMSkgewogCQlzd2l0Y2ggKGkpIHsKQEAgLTY3LDYg KzY5LDcgQEAKIAkJY2FzZSAnZSc6IGRvX3JlZ2V4ID0gMTsgYnJlYWs7CiAJCWNhc2UgJ0UnOiBk b19lY2xhc3MgPSAxOyBicmVhazsKIAkJY2FzZSAnSCc6IHNob3dfZmlsZW5hbWUgPSAxOyBicmVh azsKKwkJY2FzZSAncyc6IHNraXBfY29tbWVudHMgPSAxOyBicmVhazsKIAkJQ09NTU9OX0dFVE9Q VFNfQ0FTRVMocWdyZXApCiAJCX0KIAl9CkBAIC0xMDcsNiArMTEwLDEyIEBACiAJCQkJaWYgKChw ID0gc3RycmNocihidWYwLCAnXHInKSkgIT0gTlVMTCkKIAkJCQkJKnAgPSAwOwogCisJCQkJaWYg KHNraXBfY29tbWVudHMpIHsKKwkJCQkJcCA9IGJ1ZjA7CisJCQkJCXdoaWxlICgqcCA9PSAnICcg fHwgKnAgPT0gJ1x0JykgcCsrOworCQkJCQlpZiAoKnAgPT0gJyMnKSBjb250aW51ZTsKKwkJCQl9 CisKIAkJCQlpZiAoIWludmVydF9tYXRjaCkgewogCQkJCQlpZiAoZG9fcmVnZXggPT0gMCkgewog CQkJCQkJaWYgKCggKEZVTkMgKikgKHN0cmZ1bmMpIChidWYwLCBhcmd2W29wdGluZF0pKSA9PSBO VUxMKSBjb250aW51ZTsK 113549 2007-03-17 08:37 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