Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2014-11-18 22:53:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare"
Changes:
--------
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-08-21 17:24:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2014-11-18 22:53:17.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Nov 12 09:29:24 UTC 2014 - sch...@suse.de
+
+- Use $(...) instead of `...` to avoid losing backslash quoting
+
+-------------------------------------------------------------------
+Fri Nov 7 11:12:10 UTC 2014 - oher...@suse.de
+
+- Update check-all option to really keep going and check all files
+- Add check to recursively look into gzip files with odd suffix
+ to properly handle /usr/share/vlc/skins2/default.vlt
+
+-------------------------------------------------------------------
+Sat Aug 2 19:37:18 UTC 2014 - johannesoberm...@gmx.de
+
+- Fix quoting .
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ functions.sh ++++++
--- /var/tmp/diff_new_pack.MW8ouC/_old 2014-11-18 22:53:18.000000000 +0100
+++ /var/tmp/diff_new_pack.MW8ouC/_new 2014-11-18 22:53:18.000000000 +0100
@@ -82,25 +82,31 @@
# the DISTURL tag can be used as checkin ID
#echo "$QF"
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z "$check_all"; then
+ rm $file1 $file2
+ return 1
+ fi
fi
# Remember to quote the . which is in release
- release1=`$RPM --qf "%{RELEASE}" "$oldrpm"|sed -e 's/\./\\./g'`
- release2=`$RPM --qf "%{RELEASE}" "$newrpm"|sed -e 's/\./\\./g'`
+ release1=$($RPM --qf "%{RELEASE}" "$oldrpm"|sed -e 's/\./\\./g')
+ release2=$($RPM --qf "%{RELEASE}" "$newrpm"|sed -e 's/\./\\./g')
# This might happen with a forced rebuild of factory
if [ "${release1%.*}" != "${release2%.*}" ] ; then
echo "release prefix mismatch"
- return 1
+ if test -z "$check_all"; then
+ return 1
+ fi
fi
check_provides $oldrpm $release1 > $file1
check_provides $newrpm $release2 > $file2
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z "$check_all"; then
+ rm $file1 $file2
+ return 1
+ fi
fi
# scripts, might contain release number
@@ -109,8 +115,10 @@
check_header $newrpm | sed -e "s,-$release2$,-@RELEASE@," > $file2
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z "$check_all"; then
+ rm $file1 $file2
+ return 1
+ fi
fi
# First check the file attributes and later the md5s
@@ -130,8 +138,10 @@
check_header $newrpm | sed -e "s,-$release2,-@RELEASE@," > $file2
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z "$check_all"; then
+ rm $file1 $file2
+ return 1
+ fi
fi
# now the md5sums. if they are different, we check more detailed
++++++ rpm-check.sh ++++++
--- /var/tmp/diff_new_pack.MW8ouC/_old 2014-11-18 22:53:18.000000000 +0100
+++ /var/tmp/diff_new_pack.MW8ouC/_new 2014-11-18 22:53:18.000000000 +0100
@@ -104,7 +104,9 @@
;;
1)
echo "RPM meta information is different"
- exit 1
+ if test -z "$check_all"; then
+ exit 1
+ fi
;;
2)
;;
@@ -150,6 +152,45 @@
}
+check_gzip_file()
+{
+ local file=$1
+ local tmpdir=`mktemp -d`
+ local ftype
+ local ret=0
+ if test -n "$tmpdir"; then
+ mkdir $tmpdir/{old,new}
+ cp --parents --dereference old/$file $tmpdir/
+ cp --parents --dereference new/$file $tmpdir/
+ if pushd $tmpdir > /dev/null ; then
+ mv old/$file{,.gz}
+ mv new/$file{,.gz}
+ gunzip old/$file.gz
+ gunzip new/$file.gz
+ ftype=`/usr/bin/file old/$file | cut -d: -f2-`
+ case $ftype in
+ *POSIX\ tar\ archive)
+ echo "gzip content is: $ftype"
+ mv old/$file{,.tar}
+ mv new/$file{,.tar}
+ if ! check_single_file ${file}.tar; then
+ ret=1
+ fi
+ ;;
+ *)
+ echo "unhandled gzip content: $ftype"
+ if ! diff_two_files; then
+ ret=1
+ fi
+ ;;
+ esac
+ popd > /dev/null
+ fi
+ rm -rf "$tmpdir"
+ fi
+ return $ret
+}
+
check_single_file()
{
local file="$1"
@@ -513,6 +554,12 @@
# tar might package directories - ignore them here
return 0
;;
+ *gzip\ compressed\ data*)
+ echo "gzipped file with odd filename: $file"
+ if ! check_gzip_file "$file"; then
+ return 1
+ fi
+ ;;
*)
if ! diff_two_files; then
return 1
++++++ same-build-result.sh ++++++
--- /var/tmp/diff_new_pack.MW8ouC/_old 2014-11-18 22:53:18.000000000 +0100
+++ /var/tmp/diff_new_pack.MW8ouC/_new 2014-11-18 22:53:18.000000000 +0100
@@ -64,8 +64,8 @@
# Get release from first RPM and keep for rpmlint check
# Remember to quote the "." for future regexes
-release1=`rpm -qp --nodigest --nosignature --qf "%{RELEASE}"
"${OLDRPMS[0]}"|sed -e 's/\./\\./g'`
-release2=`rpm -qp --nodigest --nosignature --qf "%{RELEASE}"
"${NEWRPMS[0]}"|sed -e 's/\./\\./g'`
+release1=$(rpm -qp --nodigest --nosignature --qf "%{RELEASE}"
"${OLDRPMS[0]}"|sed -e 's/\./\\./g')
+release2=$(rpm -qp --nodigest --nosignature --qf "%{RELEASE}"
"${NEWRPMS[0]}"|sed -e 's/\./\\./g')
SUCCESS=1
rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature '
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
