Hello community, here is the log from the commit of package obs-service-format_spec_file for openSUSE:Factory checked in at 2012-02-04 11:22:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-format_spec_file (Old) and /work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-format_spec_file", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-format_spec_file/obs-service-format_spec_file.changes 2012-02-03 10:24:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new/obs-service-format_spec_file.changes 2012-02-04 11:22:30.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 4 09:35:13 UTC 2012 - adrian@suse.de + +- handle failing prepare_spec when $OUTDIR=$PWD correct + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ format_spec_file ++++++ --- /var/tmp/diff_new_pack.kYjWEA/_old 2012-02-04 11:22:31.000000000 +0100 +++ /var/tmp/diff_new_pack.kYjWEA/_new 2012-02-04 11:22:31.000000000 +0100 @@ -31,9 +31,18 @@ echo "WARNING: no spec file found" exit 0 fi - /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i" || RETURN=1 - # remove all file files which are indendical to committed files - cmp -s "$i" "$MYOUTDIR/$i" && rm "$MYOUTDIR/$i" + if /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" > "$MYOUTDIR/$i.$$"; then + # remove all file files which are indendical to committed files + # be carefull for the case that $MYOUDIR is local dir + if cmp -s "$i" "$MYOUTDIR/$i.$$"; then + rm "$MYOUTDIR/$i.$$" + else + mv "$MYOUTDIR/$i.$$" "$MYOUTDIR/$i" + fi + else + rm "$MYOUTDIR/$i.$$" + RETURN=1 + fi done exit $RETURN ++++++ licenses_changes.txt ++++++ --- /var/tmp/diff_new_pack.kYjWEA/_old 2012-02-04 11:22:31.000000000 +0100 +++ /var/tmp/diff_new_pack.kYjWEA/_new 2012-02-04 11:22:31.000000000 +0100 @@ -199,7 +199,7 @@ GPL-2.0-with-GCC-exception GPL-2.0-with-GCC-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception -SUSE-GPL-3.0+-with-openssl-exception GPLv2+ with openssl linking exception +SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception GPL-2.0+ GPL-2.0+ GPL-2.0+ GPL-2+ GPL-3.0 GPL-3 @@ -371,4 +371,4 @@ SUSE-Firmware Firmware license, redistributable unmodified SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. Artistic-1.0 or GPL-1.0+ Perl License -SUSE-NonFree NonFree licenses \ No newline at end of file +SUSE-NonFree NonFree licenses -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org