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

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

commit:     1edc608be5cb86ae31eddecb2f6753b0b98db431
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:48:59 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:48:59 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1edc608b

New --orphans option (and commit forgotten ChangeLog entry for --version).

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

---
 ChangeLog       |    8 ++++++++
 emacs-updater   |   11 ++++++++---
 emacs-updater.8 |    3 +++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2189a14..358e64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-25  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (OPTIONS): New options --orphans|-o and --version.
+	(ORPHANS): New variable.
+	(version): New function.
+	(usage): Update help text.
+	* emacs-updater.8: Describe new options.
+
 2009-08-09  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (OPTIONS): New option --package-manager-command.

diff --git a/emacs-updater b/emacs-updater
index b81ce90..f6d0c5a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -20,6 +20,7 @@ PM_COMMAND=pm_auto
 # Other default variable settings
 EXACT=
 NOCOLOUR=
+ORPHANS=
 PRETEND=
 
 usage() {
@@ -40,6 +41,7 @@ usage() {
 	X  -e, --exact            match exact versions when remerging packages
 	X  -n, --nocolour, --nocolor
 	X                         disable colour in output
+	X  -o, --orphans          list orphan files
 	X  -p, --pretend          don't actually emerge packages
 	X  -P, --package-manager PM
 	X                         select a package manager. PM is one out of
@@ -94,8 +96,8 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
-    --long action:,exact,help,nocolour,nocolor,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
+    --long action:,exact,help,nocolour,nocolor,orphans,pretend \
     --long package-manager:,package-manager-command:,version \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
@@ -108,6 +110,7 @@ do
 	-h|--help)      usage 0 ;;
 	--version)      version ;;
 	-e|--exact)     EXACT="true"; shift 1 ;;
+	-o|--orphans)   ORPHANS="true"; shift 1 ;;
 	-p|--pretend)   PRETEND="true"; shift 1 ;;
 	-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
 	-a|--action)
@@ -256,7 +259,9 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
 [ ${NO_OF_FILES} -eq 1 ] && s= || s=s
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
-if [ "${EXACT}" ]; then
+if [ "${ORPHANS}" ]; then
+    qfile -oCR -f "${TMPFILE}" | sort -u
+elif [ "${EXACT}" ]; then
     qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
 else
     qfile -qCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"

diff --git a/emacs-updater.8 b/emacs-updater.8
index 2d8e157..3789882 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -36,6 +36,9 @@ Match exact versions when remerging packages
 .B -n, --nocolour, --nocolor
 Disable colour in output
 .TP
+.B -o, --orphans
+List orphan files, i.e. files that are not owned by any package.
+.TP
 .B -p, --pretend
 Don't actually emerge packages
 .TP