[gentoo-commits] emacs r1641 - emacs-updater

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2011-01-05 11:11:27 +0000 (Wed, 05 Jan 2011)
New Revision: 1641

Modified:
   emacs-updater/ChangeLog
   emacs-updater/emacs-updater
Log:
Use wc instead of sed for line counting. Postpone "no packages" message.

Modified: emacs-updater/ChangeLog
===================================================================
--- emacs-updater/ChangeLog	2011-01-05 10:27:45 UTC (rev 1640)
+++ emacs-updater/ChangeLog	2011-01-05 11:11:27 UTC (rev 1641)
@@ -1,3 +1,9 @@
[phone]  Ulrich Mueller  <ulm@g.o>
+
+	* emacs-updater: Use wc instead of sed for line counting; the
+	latter did not work for empty files. Postpone message that no
+	packages have been found.
+
 2010-11-27  Ulrich Mueller  <ulm@g.o>
 
 	* emacs-updater (have_paludis, pm_paludis): Use cave instead of

Modified: emacs-updater/emacs-updater
===================================================================
--- emacs-updater/emacs-updater	2011-01-05 10:27:45 UTC (rev 1640)
+++ emacs-updater/emacs-updater	2011-01-05 11:11:27 UTC (rev 1641)
@@ -273,8 +273,8 @@
     exit 3
 fi
 
-NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
-[ ${NO_OF_FILES} -eq 1 ] && s= || s=s
+NO_OF_FILES=$(wc -l <"${TMPFILE}")
+[ "${NO_OF_FILES}" -eq 1 ] && s= || s=s
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
 if [ "${ORPHANS}" ]; then
@@ -287,13 +287,8 @@
     # qfile -eqCR -f "${TMPFILE}" | sort -u | xargs qlist -eqCILS
 fi
 
-if [ ! -s "${PKGFILE}" ]; then
-    warning "No packages to update, quitting."
-    exit 3
-fi
-
-NO_OF_PACKAGES=$(sed -n '$=' "${PKGFILE}")
-[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
+NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
+[ "${NO_OF_PACKAGES}" -eq 1 ] && s= || s=s
 if [ "${ORPHANS}" ]; then
     message "${NO_OF_PACKAGES} orphan file${s} found:"
 else
@@ -307,6 +302,11 @@
 fi
 
 echo
+if [ "${NO_OF_PACKAGES}" -eq 0 ]; then
+    warning "No packages to update, quitting."
+    exit 3
+fi
+
 if [ "${BATCH}" ]; then
     message "Remerging packages ..."
 else