5652 2004-12-09 01:52:33 +0300 Handle single SRC.RPM's as well as entire directories 2005-09-29 13:43:12 +0400 1 1 4 Development Sisyphus sisyphus_check unstable all Linux CLOSED FIXED P2 enhancement --- 1 evseev ldv at glebfm imz ldv legion mike placeholder qa-sisyphus oldest_to_newest 20290 0 evseev 2004-12-09 01:52:33 +0300 This patch allows checking of separate RPM's, and should be useful for ordinal mantainers who sends single package at once. =================================================== --- /usr/bin/sisyphus_check.orig 2004-07-15 23:45:35 +0400 +++ /usr/bin/sisyphus_check 2004-12-09 01:40:20 +0300 @@ -424,16 +424,22 @@ # quick arg check. local d for d in "$@"; do - [ -d "$d" ] || { FileError "$d: not a directory"; rc=1; continue; } + [ -d "$d" ] && continue + [ -f "$d" ] || { FileError "$d: not a directory nor regular file"; rc= 1; continue; } + case "$d" in + *.src.rpm ) continue ;; + esac + FileError "$d: regular file but not source RPM"; rc=1; continue done [ $rc = 0 ] || return $rc init_check || Fatal "init_check failed." for d in "$@"; do - [ -d "$d" ] || { FileError "$d: not a directory"; rc=1; continue; } + [ -d "$d" -o -f "$d" ] || { FileError "$d: not a directory nor regular file"; rc=1; continue; } local f for f in "$d"/*.rpm; do + [ -f "$d" ] && f="$d" if [ ! -f "$f" ]; then [ "$f" != "$d/*.rpm" ] || continue FileError "not a regular file" "$f" @@ -601,6 +607,8 @@ rc=1 [ -z "$fast_check" ] || continue fi + + [ "$f" = "$d" ] && break done done Steps to Reproduce: 1. sisyphus_check my.src.rpm && echo Ok || echo Bad Actual Results: ERROR: my.src.rpm: not a directory Bad Expected Results: Ok 20300 1 legion 2004-12-09 14:44:12 +0300 Please, create new attachment for your patch. 20451 2 668 evseev 2004-12-15 09:15:01 +0300 Created attachment 668 This patch allows processing of separate packages as well as entire directories 23242 3 803 evseev 2005-04-11 15:14:01 +0400 Created attachment 803 The same idea in new implementation ;-) Теперь в командной строке можно указывать как каталоги, так и отдельные RPM-файлы. Удобно для тех, кто собирает и проверяет пакеты поштучно. Предыдущий патч разрешал указывать только src.rpm, но ругался на бинарные. Теперь допустимы и те, и те :-))) 23308 4 807 evseev 2005-04-12 20:39:50 +0400 Created attachment 807 bugfix'd version of previous patch Предыдущая версия патча содержала крошечную ошибку - полностью игнорировала RPM-файлы ;-((( Исправлено. 24443 5 ldv 2005-05-12 17:20:59 +0400 I'll implement it but in different way. 24444 6 mike 2005-05-12 17:22:15 +0400 "I did it myyyyyy waaaaaay" (c) Frank Sinatra ииии? :) 24464 7 ldv 2005-05-12 20:54:23 +0400 Implemented in sisyphus_check-0.7.12-alt1 668 2004-12-15 09:15:00 +0300 2005-04-11 15:14:01 +0400 This patch allows processing of separate packages as well as entire directories sisyphus_check.single_pkgs.patch text/plain 1058 evseev LS0tIC91c3IvYmluL3Npc3lwaHVzX2NoZWNrLm9yaWcJMjAwNC0wNy0xNSAyMzo0NTozNSArMDQw MAorKysgL3Vzci9iaW4vc2lzeXBodXNfY2hlY2sJMjAwNC0xMi0wOSAwMTo0MDoyMCArMDMwMApA QCAtNDI0LDE2ICs0MjQsMjIgQEAKIAkjIHF1aWNrIGFyZyBjaGVjay4KIAlsb2NhbCBkCiAJZm9y IGQgaW4gIiRAIjsgZG8KLQkJWyAtZCAiJGQiIF0gfHwgeyBGaWxlRXJyb3IgIiRkOiBub3QgYSBk aXJlY3RvcnkiOyByYz0xOyBjb250aW51ZTsgfQorCQlbIC1kICIkZCIgXSAmJiBjb250aW51ZQor CQlbIC1mICIkZCIgXSB8fCB7IEZpbGVFcnJvciAiJGQ6IG5vdCBhIGRpcmVjdG9yeSBub3IgcmVn dWxhciBmaWxlIjsgcmM9MTsgY29udGludWU7IH0KKwkJY2FzZSAiJGQiIGluCisJCQkqLnNyYy5y cG0gKSBjb250aW51ZSA7OworCQllc2FjCisJCUZpbGVFcnJvciAiJGQ6IHJlZ3VsYXIgZmlsZSBi dXQgbm90IHNvdXJjZSBSUE0iOyByYz0xOyBjb250aW51ZQogCWRvbmUKIAlbICRyYyA9IDAgXSB8 fCByZXR1cm4gJHJjCiAKIAlpbml0X2NoZWNrIHx8IEZhdGFsICJpbml0X2NoZWNrIGZhaWxlZC4i CiAKIAlmb3IgZCBpbiAiJEAiOyBkbwotCQlbIC1kICIkZCIgXSB8fCB7IEZpbGVFcnJvciAiJGQ6 IG5vdCBhIGRpcmVjdG9yeSI7IHJjPTE7IGNvbnRpbnVlOyB9CisJCVsgLWQgIiRkIiAtbyAtZiAi JGQiIF0gfHwgeyBGaWxlRXJyb3IgIiRkOiBub3QgYSBkaXJlY3Rvcnkgbm9yIHJlZ3VsYXIgZmls ZSI7IHJjPTE7IGNvbnRpbnVlOyB9CiAJCWxvY2FsIGYKIAkJZm9yIGYgaW4gIiRkIi8qLnJwbTsg ZG8KKwkJCVsgLWYgIiRkIiBdICYmIGY9IiRkIgogCQkJaWYgWyAhIC1mICIkZiIgXTsgdGhlbgog CQkJCVsgIiRmIiAhPSAiJGQvKi5ycG0iIF0gfHwgY29udGludWUKIAkJCQlGaWxlRXJyb3IgIm5v dCBhIHJlZ3VsYXIgZmlsZSIgIiRmIgpAQCAtNjAxLDYgKzYwNyw4IEBACiAJCQkJcmM9MQogCQkJ CVsgLXogIiRmYXN0X2NoZWNrIiBdIHx8IGNvbnRpbnVlCiAJCQlmaQorCisJCQlbICIkZiIgPSAi JGQiIF0gJiYgYnJlYWsKIAkJZG9uZQogCWRvbmUKIAo= 803 2005-04-11 15:14:01 +0400 2005-04-12 20:39:50 +0400 The same idea in new implementation ;-) sisyphus_check-allowfiles.patch text/plain 1015 evseev LS0tIC91c3IvYmluL3Npc3lwaHVzX2NoZWNrCTIwMDQtMTItMjkgMTQ6MzM6NDMgKzAzMDAKKysr IC91c3IvYmluL3Npc3lwaHVzX2NoZWNrLm5ldwkyMDA1LTA0LTExIDE0OjQ0OjUyICswNDAwCkBA IC00ODQsNiArNDg0LDE2IEBACiAJcGFja2FnZXJfcGF0dGVybj0nPFteQF0rKEB8IGF0ICkocGFj a2FnZXNcLik/YWx0bGludXgoXC58IGRvdCApKGNvbXxuZXR8b3JnfHJ1KT4nCiB9CiAKK2lzX3Zh bGlkX2ZpbGVuYW1ldHlwZSgpCit7CisJdGVzdCAtZCAiJDEiICYmIHJldHVybiAwCisJY2FzZSAi JDEiIGluCisJCSoucnBtICkgdGVzdCAtZiAiJDEiICYmIHJldHVybiAwIDs7CisJZXNhYworCUZp bGVFcnJvciAiJDEgaXMgZWl0aGVyIG5vdCBkaXJlY3Rvcnkgbm9yIHJlZ3VsYXIgUlBNIGZpbGUi CisJcmV0dXJuIDEKK30KKwogZmFzdF9jaGVjaz0KICMgY3VtbXVsYXRpdmUgY2hlY2sKIGNoZWNr KCkKQEAgLTQ5MywxNCArNTAzLDE0IEBACiAJIyBxdWljayBhcmcgY2hlY2suCiAJbG9jYWwgZAog CWZvciBkIGluICIkQCI7IGRvCi0JCVsgLWQgIiRkIiBdIHx8IHsgRmlsZUVycm9yICIkZDogbm90 IGEgZGlyZWN0b3J5IjsgcmM9MTsgY29udGludWU7IH0KKwkJaXNfdmFsaWRfZmlsZW5hbWV0eXBl ICIkZCIgfHwgeyByYz0xOyBjb250aW51ZTsgfQogCWRvbmUKIAlbICRyYyA9IDAgXSB8fCByZXR1 cm4gJHJjCiAKIAlpbml0X2NoZWNrIHx8IEZhdGFsICJpbml0X2NoZWNrIGZhaWxlZC4iCiAKIAlm b3IgZCBpbiAiJEAiOyBkbwotCQlbIC1kICIkZCIgXSB8fCB7IEZpbGVFcnJvciAiJGQ6IG5vdCBh IGRpcmVjdG9yeSI7IHJjPTE7IGNvbnRpbnVlOyB9CisJCWlzX3ZhbGlkX2ZpbGVuYW1ldHlwZSAi JGQiIHx8IHsgcmM9MTsgY29udGludWU7IH0KIAkJbG9jYWwgZmlsZWxpc3QgZgogCQlpZiBbIC1u ICIkcmVjdXJzZV9zdWJkaXIiIF07IHRoZW4KIAkJCWZpbGVsaXN0PSIkKGZpbmQgIiRkIiAtbWlu ZGVwdGggMSAtbm90IC10eXBlIGQpIiB8fCB7IHJjPTE7IGNvbnRpbnVlOyB9Cg== 807 2005-04-12 20:39:50 +0400 2005-04-12 20:39:50 +0400 bugfix'd version of previous patch sisyphus_check-allowfiles.patch text/plain 1182 evseev LS0tIC91c3IvYmluL3Npc3lwaHVzX2NoZWNrLm9yaWcJMjAwNC0xMi0yOSAxNDozMzo0MyArMDMw MAorKysgL3Vzci9iaW4vc2lzeXBodXNfY2hlY2sJMjAwNS0wNC0xMiAxNTozODowOSArMDQwMApA QCAtNDg0LDYgKzQ4NCwxNiBAQAogCXBhY2thZ2VyX3BhdHRlcm49JzxbXkBdKyhAfCBhdCApKHBh Y2thZ2VzXC4pP2FsdGxpbnV4KFwufCBkb3QgKShjb218bmV0fG9yZ3xydSk+JwogfQogCitpc192 YWxpZF9maWxlbmFtZXR5cGUoKQoreworCXRlc3QgLWQgIiQxIiAmJiByZXR1cm4gMAorCWNhc2Ug IiQxIiBpbgorCQkqLnJwbSApIHRlc3QgLWYgIiQxIiAmJiByZXR1cm4gMCA7OworCWVzYWMKKwlG aWxlRXJyb3IgIiQxIGlzIGVpdGhlciBub3QgZGlyZWN0b3J5IG5vciByZWd1bGFyIFJQTSBmaWxl IgorCXJldHVybiAxCit9CisKIGZhc3RfY2hlY2s9CiAjIGN1bW11bGF0aXZlIGNoZWNrCiBjaGVj aygpCkBAIC00OTMsMTYgKzUwMywxOCBAQAogCSMgcXVpY2sgYXJnIGNoZWNrLgogCWxvY2FsIGQK IAlmb3IgZCBpbiAiJEAiOyBkbwotCQlbIC1kICIkZCIgXSB8fCB7IEZpbGVFcnJvciAiJGQ6IG5v dCBhIGRpcmVjdG9yeSI7IHJjPTE7IGNvbnRpbnVlOyB9CisJCWlzX3ZhbGlkX2ZpbGVuYW1ldHlw ZSAiJGQiIHx8IHsgcmM9MTsgY29udGludWU7IH0KIAlkb25lCiAJWyAkcmMgPSAwIF0gfHwgcmV0 dXJuICRyYwogCiAJaW5pdF9jaGVjayB8fCBGYXRhbCAiaW5pdF9jaGVjayBmYWlsZWQuIgogCiAJ Zm9yIGQgaW4gIiRAIjsgZG8KLQkJWyAtZCAiJGQiIF0gfHwgeyBGaWxlRXJyb3IgIiRkOiBub3Qg YSBkaXJlY3RvcnkiOyByYz0xOyBjb250aW51ZTsgfQorCQlpc192YWxpZF9maWxlbmFtZXR5cGUg IiRkIiB8fCB7IHJjPTE7IGNvbnRpbnVlOyB9CiAJCWxvY2FsIGZpbGVsaXN0IGYKLQkJaWYgWyAt biAiJHJlY3Vyc2Vfc3ViZGlyIiBdOyB0aGVuCisJCWlmIFsgISAtZCAiJGQiIF07IHRoZW4KKwkJ CWZpbGVsaXN0PSIkZCIKKwkJZWxpZiBbIC1uICIkcmVjdXJzZV9zdWJkaXIiIF07IHRoZW4KIAkJ CWZpbGVsaXN0PSIkKGZpbmQgIiRkIiAtbWluZGVwdGggMSAtbm90IC10eXBlIGQpIiB8fCB7IHJj PTE7IGNvbnRpbnVlOyB9CiAJCWVsc2UKIAkJCWZpbGVsaXN0PSIkKGZpbmQgIiRkIiAtbWluZGVw dGggMSAtbWF4ZGVwdGggMSkiIHx8IHsgcmM9MTsgY29udGludWU7IH0K