Hello community, here is the log from the commit of package osc-source_validator for openSUSE:Factory checked in at Tue Mar 1 16:33:57 CET 2011. -------- --- osc-source_validator/osc-source_validator.changes 2011-01-13 14:30:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes 2011-02-18 12:50:52.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 18 11:39:29 UTC 2011 - jw@novell.com + +- retry broken sr#59008 +- added another set of runtime-fixes.diff + * accept .orig and ~ files in working directories. + * UI consistency improved. + +------------------------------------------------------------------- +Sat Feb 12 11:10:42 UTC 2011 - ro@novell.com + +- 50-spec-version: show warning only once per specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.ZXC6ki/_old 2011-03-01 16:28:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ZXC6ki/_new 2011-03-01 16:28:50.000000000 +0100 @@ -19,7 +19,7 @@ Name: osc-source_validator Version: 0.1 -Release: 1 +Release: 6 License: GPLv2+ Summary: osc source validator Url: http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator ++++++ osc-source_validator-0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/20-files-present-and-referenced new/osc-source_validator-0.1/20-files-present-and-referenced --- old/osc-source_validator-0.1/20-files-present-and-referenced 2011-01-13 12:34:45.000000000 +0100 +++ new/osc-source_validator-0.1/20-files-present-and-referenced 2011-03-01 15:53:30.000000000 +0100 @@ -254,6 +254,8 @@ *.dsc | \ ready | \ _* | \ + *.orig | \ + *~ | \ .gitignore) ;; *) @@ -264,11 +266,13 @@ if [ ! -d $DIR_TO_CHECK/.osc ] ; then echo "!! $BASE is a directory !!" if test "$BATCHMODE" != true ; then - echo "remove the whole subtree with 'd'" - echo -n "Is this correct? [N/y/d] (y to ignore) " + echo " remove subtree with 'r'" + echo "ignore and continue with 'y'" + echo -n "Is this correct? [N/y/r] " read ANSWER test "$ANSWER" = y -o "$ANSWER" = Y || { - if test "$ANSWER" = d -o "$ANSWER" = D ; then + # r for remove is also accepted, to make it compatible with osc itself + if test "$ANSWER" = d -o "$ANSWER" = D -o "$ANSWER" = r -o "$ANSWER" = R; then rm -Rfv $DIR_TO_CHECK/$BASE else echo ok, please fix it... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/50-spec-version new/osc-source_validator-0.1/50-spec-version --- old/osc-source_validator-0.1/50-spec-version 2011-01-13 12:34:45.000000000 +0100 +++ new/osc-source_validator-0.1/50-spec-version 2011-03-01 15:53:30.000000000 +0100 @@ -10,6 +10,7 @@ test "$VERBOSE" = true && echo -n "- checking version in specfile " for i in $DIR_TO_CHECK/*.spec ; do + WARNING_SHOWN="" test -f $i || continue test "$VERBOSE" = true && echo -n "." RETURN=0 @@ -27,13 +28,16 @@ } ;; %*) - echo "WARNING: macro used in version line" - echo "packager is responsible that the resulting string" - echo "is non-empty and contains no \"-\"." - echo "----------" - grep -A2 -B2 -a -i -e "^Version:.*%" $i - echo "----------" - sleep 2 + if test -z "$WARNING_SHOWN" ; then + echo "WARNING: macro used in version line" + echo "packager is responsible that the resulting string" + echo "is non-empty and contains no \"-\"." + echo "----------" + grep -A2 -B2 -a -i -e "^Version:.*%" $i + echo "----------" + WARNING_SHOWN="yes" + sleep 2 + fi ;; *-*) echo ERROR: `basename $i` has a Version with a \"-\". This is not allowed. @@ -47,6 +51,7 @@ done || RETURN=1 done + test "$VERBOSE" = true && echo done exit $RETURN ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org