From f66a70e0dab3c89990ccd340a91c61d5ce44d93e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 5 Jan 2012 23:20:02 +0000 Subject: [PATCH] Fix use of dosym with directory destination. --- eclass/ChangeLog | 5 ++++- eclass/systemd.eclass | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a58b01bda787..32d92e0205ae 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.71 2012/01/05 22:42:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.72 2012/01/05 23:20:02 mgorny Exp $ + + 05 Jan 2012; Michał Górny systemd.eclass: + Fix use of dosym with directory destination. 05 Jan 2012; Michał Górny autotools-utils.eclass: Add AUTOTOOLS_AUTORECONF for bug #392073. diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 4d8e3e1e8563..6b94a558c2d0 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.9 2011/09/17 13:48:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.10 2012/01/05 23:20:02 mgorny Exp $ # @ECLASS: systemd.eclass # @MAINTAINER: @@ -105,9 +105,10 @@ systemd_enable_service() { local target=${1} local service=${2} local ud=$(_systemd_get_unitdir) + local destname=$(basename "${service}") dodir "${ud}"/"${target}".wants && \ - dosym ../"${service}" "${ud}"/"${target}".wants + dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}" } # @FUNCTION: systemd_with_unitdir -- 2.26.2