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

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

commit:     f660dd132fdb09702ac56d79d0a3b06805dc609c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 18:50:58 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 18:50:58 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f660dd13

New --major option.

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

---
 ChangeLog       |    5 +++--
 emacs-updater   |   17 ++++++++++++++---
 emacs-updater.8 |    3 +++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 358e64b..7b18317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2009-08-25  Ulrich Mueller  <ulm@gentoo.org>
 
-	* emacs-updater (OPTIONS): New options --orphans|-o and --version.
-	(ORPHANS): New variable.
+	* emacs-updater (OPTIONS): New options --major|-m, --orphans|-o,
+	and --version.
+	(MAJOR, ORPHANS): New variables.
 	(version): New function.
 	(usage): Update help text.
 	* emacs-updater.8: Describe new options.

diff --git a/emacs-updater b/emacs-updater
index 8832fed..8027f27 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -19,6 +19,7 @@ PM_COMMAND=pm_auto
 
 # Other default variable settings
 EXACT=
+MAJOR=
 NOCOLOUR=
 ORPHANS=
 PRETEND=
@@ -39,6 +40,8 @@ usage() {
 	X                           byte-compiled Elisp files
 	X                         (default: sitedir,rebuild)
 	X  -e, --exact            match exact versions when remerging packages
+	X  -m, --major            use only the major version when comparing
+	X                         Emacs version numbers
 	X  -n, --nocolour, --nocolor
 	X                         disable colour in output
 	X  -o, --orphans          list orphan files
@@ -96,8 +99,8 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
-    --long action:,exact,help,nocolour,nocolor,orphans,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehmnopP: \
+    --long action:,exact,help,major,nocolour,nocolor,orphans,pretend \
     --long package-manager:,package-manager-command:,version \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
@@ -110,6 +113,7 @@ do
 	-h|--help)      usage 0 ;;
 	--version)      version ;;
 	-e|--exact)     EXACT="true"; shift 1 ;;
+	-m|--major)     MAJOR="true"; shift 1 ;;
 	-o|--orphans)   ORPHANS="true"; shift 1 ;;
 	-p|--pretend)   PRETEND="true"; shift 1 ;;
 	-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
@@ -147,6 +151,11 @@ do
 	    ;;
 	--package-manager-command) PM_COMMAND=${2}; shift 2 ;;
 	--) shift; break ;;
+	*)
+	    # this should not happen; getopt should return bad status
+	    echo "Invalid option '${1}' given!"
+	    usage 22
+	    ;;
     esac
 done
 
@@ -223,7 +232,9 @@ action_rebuild() {
 	version=$(bytecomp_version "${elc}")
 	version=${version:-unknown}
 
-	if [ "${version}" != "${active}" ] || [ "${1}" = all ]; then
+	if [ -z "${MAJOR}" -a "${version}" != "${active}" ] \
+	    || [ "${version%%.*}" != "${active%%.*}" ] \
+	    || [ "${1}" = all ]; then
 	    echo "Found ${elc##*/} (compiled by Emacs version ${version})"
 	    echo "${elc}" >> "${TMPFILE}"
 	else

diff --git a/emacs-updater.8 b/emacs-updater.8
index 3789882..b05fcae 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -33,6 +33,9 @@ Rebuild all packages that have byte-compiled Elisp files
 .B -e, --exact
 Match exact versions when remerging packages
 .TP
+.B -m, --major
+Use only the major version when comparing Emacs version numbers
+.TP
 .B -n, --nocolour, --nocolor
 Disable colour in output
 .TP