From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4DAA2138206 for ; Wed, 3 Jan 2018 22:51:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AD12E07F9; Wed, 3 Jan 2018 22:51:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47BECE07F9 for ; Wed, 3 Jan 2018 22:51:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D553F335C30 for ; Wed, 3 Jan 2018 22:51:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D7AC193 for ; Wed, 3 Jan 2018 22:51:09 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1514933692.de894fa54f08e5adf3339e717e5d6ac3baf9e0bb.chewi@gentoo> Subject: [gentoo-commits] proj/eselect-java:master commit in: src/modules/, / X-VCS-Repository: proj/eselect-java X-VCS-Files: NEWS src/modules/java-vm.eselect.in X-VCS-Directories: / src/modules/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: de894fa54f08e5adf3339e717e5d6ac3baf9e0bb X-VCS-Branch: master Date: Wed, 3 Jan 2018 22:51:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d7e8af12-5897-4cc2-9062-c141bcc46814 X-Archives-Hash: cb7167ef07770b780660ab5b2ba8d485 commit: de894fa54f08e5adf3339e717e5d6ac3baf9e0bb Author: James Le Cuirot gentoo org> AuthorDate: Thu Dec 28 21:46:15 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 2 22:54:52 2018 +0000 URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=de894fa5 Fix mkdir die message in java-vm module NEWS | 1 + src/modules/java-vm.eselect.in | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 669548f..3faaf11 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 0.4.0: * Don't emit (unset) or (not a symlink) on stderr (#549498) + * Fix mkdir die message in java-vm module 0.3.0: diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in index c964a34..3d5de4d 100644 --- a/src/modules/java-vm.eselect.in +++ b/src/modules/java-vm.eselect.in @@ -1,5 +1,5 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 DESCRIPTION="Manage the Java system and user VM" @@ -147,10 +147,8 @@ set_symlink() { if [[ -z ${target} ]] ; then die -q "Target \"${1}\" doesn't appear to be valid!" elif [[ -d "${VM_BASE}/${target}" ]] ; then - local sym_dir=$(dirname ${symlink}) - if [[ ! -d ${sym_dir} ]]; then - mkdir -p ${sym_dir} || die -q "Could not create ${my_dir}" - fi + local sym_dir=${symlink%/*} + mkdir -p "${sym_dir}" || die -q "Could not create ${sym_dir}" ln -snf "${VM_BASE}/${target}" "${symlink}" else die -q "Target \"${1}\" doesn't appear to be valid!"