[pkg-java] r12036 - in trunk/java-common: debian scripts

[Niels Thykier]

Author: nthykier-guest
Date: 2010-04-06 22:34:12 +0000 (Tue, 06 Apr 2010)
New Revision: 12036

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/scripts/update-java-alternatives
Log:
Applied patch from Thierry Basque that fixes the --list argument for update-java-alternatives.

Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2010-04-06 22:18:49 UTC (rev 12035)
+++ trunk/java-common/debian/changelog	2010-04-06 22:34:12 UTC (rev 12036)
@@ -5,6 +5,8 @@
     (Closes: #576632)
   * Removed Stefan Gybas from Uploaders (no upload since 2003); thanks
     for your work.
+  * Applied patch from Thierry Basque that fixes the --list
+    argument for update-java-alternatives. (Closes: #563070)
 
  -- Niels Thykier <niels at thykier.net>  Tue, 06 Apr 2010 21:45:15 +0200
 

Modified: trunk/java-common/scripts/update-java-alternatives
===================================================================
--- trunk/java-common/scripts/update-java-alternatives	2010-04-06 22:18:49 UTC (rev 12035)
+++ trunk/java-common/scripts/update-java-alternatives	2010-04-06 22:34:12 UTC (rev 12036)
@@ -117,9 +117,9 @@
 do_list()
 {
     vecho "listing java alternatives:"
-    for i in $top/${jname:-*}.jinfo; do
-	alias=$(basename ${i%*.jinfo})
-	alias=${alias#.*}
+    for i in ${jinfo:-$top/*.jinfo}; do
+	alias=$(basename ${i%.jinfo})
+	alias=${alias#.}
 	prio=$(awk -F= '/priority=/ {print $2}' $i)
 	echo $alias $prio $top/$alias
 	[ -n "$verbose" ] && egrep "$which" $i