Accepting request 63010 from home:a_jaeger:branches:build-compare-test

Ok

OBS-URL: https://build.opensuse.org/request/show/63010
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=91

build-compare.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb 28 14:00:35 UTC 2011 - aj@suse.de
+
+- Increase version.
+
+-------------------------------------------------------------------
+Mon Feb 28 13:51:29 UTC 2011 - mls@suse.de
+
+- Check also the first part of the release to e.g. handle rebuild of complete
+  distribution (bnc#674991).
+
 -------------------------------------------------------------------
 Thu Oct 28 09:49:14 UTC 2010 - aj@suse.de
 

build-compare.spec

@@ -23,8 +23,8 @@ License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        Build Result Compare Script
-Version:        2009.10.14
-Release:        25
+Version:        2011.02.28
+Release:        26
 Source1:        COPYING
 Source2:        same-build-result.sh
 Source3:        rpm-check.sh

functions.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2009, 2010 SUSE Linux Product GmbH, Germany.
+# Copyright (c) 2009, 2010, 2011 SUSE Linux Product GmbH, Germany.
 # Licensed under GPL v2, see COPYING file for details.
 #
 # Written by Michael Matz and Stephan Coolo
@@ -89,6 +89,11 @@ function cmp_spec ()
     
     release1=`$RPM --qf "%{RELEASE}" "$oldrpm"`
     release2=`$RPM --qf "%{RELEASE}" "$newrpm"`
+    # This might happen with a forced rebuild of factory
+    if [ "${release1%.*}" != "${release2%.*}" ] ; then
+      echo "release prefix mismatch"
+      return 1
+    fi
     
     check_provides $oldrpm $release1 > $file1
     check_provides $newrpm $release2 > $file2

srpm-check.sh

@@ -39,6 +39,7 @@ case $RES in
      exit 0
      ;;
   1)
+     echo "RPM meta information is different"
      exit 1
      ;;
   2)