[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /

["Sebastian Pipping" <sping@gentoo.org>]

commit:     1c3c9bfd8add03aeb5c273b252ec3adfaa5d8a11
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 12:42:28 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 12:42:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1c3c9bfd

Ignore last component when comparing Emacs versions.

svn path=/emacs-updater/; revision=1661

---
 ChangeLog     |    5 +++++
 emacs-updater |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a929315..aded0c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-24  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (action_rebuild): When comparing Emacs versions,
+	ignore the last component, i.e. the local build number.
+
 2011-04-06  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater: With option --orphans, imply --action=all.

diff --git a/emacs-updater b/emacs-updater
index e314137..3875123 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -238,7 +238,7 @@ action_rebuild() {
 	version=$(bytecomp_version "${elc}")
 	version=${version:-unknown}
 
-	if [ -z "${MAJOR}" -a "${version}" != "${active}" ] \
+	if [ -z "${MAJOR}" -a "${version%.*}" != "${active%.*}" ] \
 	    || [ "${version%%.*}" != "${active%%.*}" ] \
 	    || [ "${1}" = all ]
 	then