summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xscripts/update-java-alternatives6
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 27580c2..104dd64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ java-common (0.36) UNRELEASED; urgency=low
(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@thykier.net> Tue, 06 Apr 2010 21:45:15 +0200
diff --git a/scripts/update-java-alternatives b/scripts/update-java-alternatives
index bffaa70..aadbb5e 100755
--- a/scripts/update-java-alternatives
+++ b/scripts/update-java-alternatives
@@ -117,9 +117,9 @@ do_auto()
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