| 1 |
commit: de894fa54f08e5adf3339e717e5d6ac3baf9e0bb |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 28 21:46:15 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 2 22:54:52 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=de894fa5 |
| 7 |
|
| 8 |
Fix mkdir die message in java-vm module |
| 9 |
|
| 10 |
NEWS | 1 + |
| 11 |
src/modules/java-vm.eselect.in | 8 +++----- |
| 12 |
2 files changed, 4 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/NEWS b/NEWS |
| 15 |
index 669548f..3faaf11 100644 |
| 16 |
--- a/NEWS |
| 17 |
+++ b/NEWS |
| 18 |
@@ -1,6 +1,7 @@ |
| 19 |
0.4.0: |
| 20 |
|
| 21 |
* Don't emit (unset) or (not a symlink) on stderr (#549498) |
| 22 |
+ * Fix mkdir die message in java-vm module |
| 23 |
|
| 24 |
0.3.0: |
| 25 |
|
| 26 |
|
| 27 |
diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in |
| 28 |
index c964a34..3d5de4d 100644 |
| 29 |
--- a/src/modules/java-vm.eselect.in |
| 30 |
+++ b/src/modules/java-vm.eselect.in |
| 31 |
@@ -1,5 +1,5 @@ |
| 32 |
# -*-eselect-*- vim: ft=eselect |
| 33 |
-# Copyright 1999-2013 Gentoo Foundation |
| 34 |
+# Copyright 1999-2017 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
DESCRIPTION="Manage the Java system and user VM" |
| 38 |
@@ -147,10 +147,8 @@ set_symlink() { |
| 39 |
if [[ -z ${target} ]] ; then |
| 40 |
die -q "Target \"${1}\" doesn't appear to be valid!" |
| 41 |
elif [[ -d "${VM_BASE}/${target}" ]] ; then |
| 42 |
- local sym_dir=$(dirname ${symlink}) |
| 43 |
- if [[ ! -d ${sym_dir} ]]; then |
| 44 |
- mkdir -p ${sym_dir} || die -q "Could not create ${my_dir}" |
| 45 |
- fi |
| 46 |
+ local sym_dir=${symlink%/*} |
| 47 |
+ mkdir -p "${sym_dir}" || die -q "Could not create ${sym_dir}" |
| 48 |
ln -snf "${VM_BASE}/${target}" "${symlink}" |
| 49 |
else |
| 50 |
die -q "Target \"${1}\" doesn't appear to be valid!" |
Archives