From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SR41z-0004s0-OL for garchives@archives.gentoo.org; Sun, 06 May 2012 16:09:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AECE4E085E; Sun, 6 May 2012 16:06:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 827A4E085D for ; Sun, 6 May 2012 16:06:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2696B1B4022 for ; Sun, 6 May 2012 16:06:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6B23E5433 for ; Sun, 6 May 2012 16:06:11 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1314189748.1c3c9bfd8add03aeb5c273b252ec3adfaa5d8a11.sping@gentoo> Subject: [gentoo-commits] proj/emacs-tools:emacs-updater commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: ChangeLog emacs-updater X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 1c3c9bfd8add03aeb5c273b252ec3adfaa5d8a11 X-VCS-Branch: emacs-updater Date: Sun, 6 May 2012 16:06:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a8df1ca4-642f-4512-83f5-cd2bb7c36bd6 X-Archives-Hash: 6b15abf5f814c10f4a487bfb1a844aac commit: 1c3c9bfd8add03aeb5c273b252ec3adfaa5d8a11 Author: Ulrich M=C3=BCller gentoo org> AuthorDate: Wed Aug 24 12:42:28 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Wed Aug 24 12:42:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/emacs-tools.g= it;a=3Dcommit;h=3D1c3c9bfd Ignore last component when comparing Emacs versions. svn path=3D/emacs-updater/; revision=3D1661 --- 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 + + * emacs-updater (action_rebuild): When comparing Emacs versions, + ignore the last component, i.e. the local build number. + 2011-04-06 Ulrich Mueller =20 * emacs-updater: With option --orphans, imply --action=3Dall. 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=3D$(bytecomp_version "${elc}") version=3D${version:-unknown} =20 - if [ -z "${MAJOR}" -a "${version}" !=3D "${active}" ] \ + if [ -z "${MAJOR}" -a "${version%.*}" !=3D "${active%.*}" ] \ || [ "${version%%.*}" !=3D "${active%%.*}" ] \ || [ "${1}" =3D all ] then