- Remove warning file-contains-date-and-time from rpmlint.log

- Fix name-version-release regex for release without dots

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

build-compare.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Feb 12 08:41:01 UTC 2017 - olaf@aepfle.de
+
+- Remove warning file-contains-date-and-time from rpmlint.log
+
+-------------------------------------------------------------------
+Thu Jan  5 11:01:53 UTC 2017 - olaf@aepfle.de
+
+- Fix name-version-release regex for release without dots
+
 -------------------------------------------------------------------
 Wed Dec 14 08:44:11 UTC 2016 - olaf@aepfle.de
 

build-compare.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package build-compare
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@ Summary:        Build Result Compare Script
 License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            https://github.com/openSUSE/build-compare
-Version:        20161214T095953.e1115b2
+Version:        20170212T094342.98f72fb
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh

functions.sh

@@ -168,16 +168,35 @@ function get_value()
 # Set version_release_old_regex_s, version_release_old_regex_l and
 # name_ver_rel_old_regex_l, also the new ones.
 function set_regex() {
-    # Remember to quote the . which is in release
+  local rel_old=${version_release_old##*-}
+  local rel_new=${version_release_new##*-}
+
   # Short version without B_CNT
+  # release may not contain a dot
+  case "${rel_old}" in
+    *.*)
     version_release_old_regex_s=${version_release_old%.*}
+    ;;
+    *)
+    version_release_old_regex_s=${version_release_old}
+    ;;
+  esac
+  # Remember to quote the . which is in release
   version_release_old_regex_s=${version_release_old_regex_s//./\\.}
-    version_release_new_regex_s=${version_release_new%.*}
-    version_release_new_regex_s=${version_release_new_regex_s//./\\.}
   # Long version with B_CNT
   version_release_old_regex_l=${version_release_old//./\\.}
-    version_release_new_regex_l=${version_release_new//./\\.}
   name_ver_rel_old_regex_l=${name_ver_rel_old//./\\.}
+
+  case "${rel_new}" in
+    *.*)
+    version_release_new_regex_s=${version_release_new%.*}
+    ;;
+    *)
+    version_release_new_regex_s=${version_release_new}
+    ;;
+  esac
+  version_release_new_regex_s=${version_release_new_regex_s//./\\.}
+  version_release_new_regex_l=${version_release_new//./\\.}
   name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.}
 }
 

same-build-result.sh

@@ -140,10 +140,12 @@ if test -n "$OTHERDIR"; then
     # Remove release from files
     sort -u $OLDDIR/rpmlint.log|sed -e "s,$ver_rel1,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file1
     sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g"  > $file2
+    # Remove odd warning about data and time, it comes and goes
     # Remove warning about python mtime mismatch, a republish will not help
     # Remove odd warning about filenames, they contain VERSION-RELEASE
     # Remove durations from progress reports
     sed -i -e "
+    /: W: file-contains-date-and-time /d
     /: W: python-bytecode-inconsistent-mtime /d
     /: W: filename-too-long-for-joliet /d
     /: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s| x.x s|