Hello community, here is the log from the commit of package osc-source_validator for openSUSE:Factory checked in at Fri Aug 12 11:39:47 CEST 2011. -------- --- osc-source_validator/osc-source_validator.changes 2011-07-20 12:04:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes 2011-08-11 16:57:13.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 11 14:56:35 UTC 2011 - ro@suse.com + +- 20-files-present-and-referenced: + ignore "warning: waiting for shared lock" + do not overwrite RETURN=2 (error) when setting RETURN=1 (warning) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.vYUKjt/_old 2011-08-12 11:39:14.000000000 +0200 +++ /var/tmp/diff_new_pack.vYUKjt/_new 2011-08-12 11:39:14.000000000 +0200 @@ -19,7 +19,7 @@ Name: osc-source_validator Version: 0.1 -Release: 20 +Release: 22 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-07-20 12:03:10.000000000 +0200 +++ new/osc-source_validator-0.1/20-files-present-and-referenced 2011-08-11 16:55:14.000000000 +0200 @@ -120,7 +120,7 @@ sed -e "s@^$nodup:@X$nodup:@" -e "0,/^X$nodup:/{s@^X$nodup:@$nodup:@}" -e "s@^X$nodup:.*@@" $TMPDIR/tmp.spec > $TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2 $TMPDIR/tmp.spec done - $RPMBUILD -bp $TMPDIR/tmp.spec 2>>$TMPDIR/sources || { + $RPMBUILD -bp $TMPDIR/tmp.spec 2>&1 >/dev/null | egrep -v '^warning:' >>$TMPDIR/sources || { $RPMBUILD -bp $TMPDIR/tmp.spec cleanup_and_exit 1 } @@ -166,7 +166,7 @@ } for HASTOBETHER in `cat $TMPDIR/sources` ; do - check_tracked "$HASTOBETHER" || RETURN=1 + check_tracked "$HASTOBETHER" || RETURN=2 done # @@ -206,7 +206,7 @@ rm -v $DIR_TO_CHECK/$BASE else echo ok, please fix it... - RETURN=1 + test "$RETURN" != "2" && RETURN=1 fi } else @@ -230,7 +230,7 @@ rm -v $DIR_TO_CHECK/$BASE else echo ok, please fix it... - RETURN=1 + test "$RETURN" != "2" && RETURN=1 fi } else @@ -247,7 +247,7 @@ read ANSWER test "$ANSWER" = y -o "$ANSWER" = Y || { echo ok, please fix it... - RETURN=1 + test "$RETURN" != "2" && RETURN=1 } else echo "###ASK $DIR_TO_CHECK/$BASE" @@ -309,7 +309,8 @@ *) grep -a -x $BASE $TMPDIR/sources > /dev/null && continue echo "(W) Attention, $BASE is not mentioned in spec files as source or patch." - if [ -d $DIR_TO_CHECK/$BASE ] ; then + if test "$RETURN" != "2" ; then + if [ -d $DIR_TO_CHECK/$BASE ] ; then # be a bit more relaxed for osc, it won't upload directories anyway if [ ! -d $DIR_TO_CHECK/.osc ] ; then echo "!! $BASE is a directory !!" @@ -324,14 +325,14 @@ rm -Rfv $DIR_TO_CHECK/$BASE else echo ok, please fix it... - RETURN=1 + test "$RETURN" != "2" && RETURN=1 fi } else echo "###ASK -r $DIR_TO_CHECK/$BASE" fi fi - else + else if test "$BATCHMODE" != true ; then echo -n "Is this correct? [N/y/d] (y to ignore) " read ANSWER @@ -340,12 +341,13 @@ rm -v $DIR_TO_CHECK/$BASE else echo ok, please fix it... - RETURN=1 + test "$RETURN" != "2" && RETURN=1 fi } else echo "###ASK $DIR_TO_CHECK/$BASE" fi + fi fi ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org