diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-10-07 00:00:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-10-07 00:00:14 +0000 |
| commit | 555a0222d04c160984158c73d99dd75804e880c5 (patch) | |
| tree | 874e93659ef997b21b1a96b2ce8014ea0a9c7f6a /sys-apps | |
| parent | added flag for net-proxy/ziproxy (diff) | |
| download | historical-555a0222d04c160984158c73d99dd75804e880c5.tar.gz historical-555a0222d04c160984158c73d99dd75804e880c5.tar.bz2 historical-555a0222d04c160984158c73d99dd75804e880c5.zip | |
make sure only create symlinks if they dont already exist #108325 by noddy
Package-Manager: portage-2.0.53_rc4
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 24 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.11.13-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild | 4 |
3 files changed, 21 insertions, 11 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 508fa9509f6f..e56d246efebe 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,12 +1,22 @@ -MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 -MD5 839b1e7eb2ccdc96525414ab1c869e70 baselayout-1.11.13-r1.ebuild 18850 -MD5 10e1b8881d42750dd6e8e7cf343ea999 baselayout-1.12.0_pre7-r1.ebuild 18852 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 c19af6c1a4d5cc3fd9f7668c26bdeb71 ChangeLog 63073 -MD5 27b1286a02c410a3c546274318410c6f baselayout-1.12.0_pre8-r2.ebuild 19203 -MD5 0f24c65f92bca9e5131d6ebd4ad6cfa0 files/digest-baselayout-1.12.0_pre8-r2 75 +MD5 f51ce492513c3ccfaf25109ef2447727 baselayout-1.11.13-r1.ebuild 18880 +MD5 10e1b8881d42750dd6e8e7cf343ea999 baselayout-1.12.0_pre7-r1.ebuild 18852 +MD5 2f7efa6af5983c5736e7822e5034afbe baselayout-1.12.0_pre8-r2.ebuild 19230 MD5 8e94b4b8d22e16ea03fa08dd0475170a files/baselayout-1.12.0_pre7-ifconfig.patch 1327 -MD5 6d5643e0857fc0f32f026e33d453c0c8 files/digest-baselayout-1.12.0_pre7-r1 75 -MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-1.12.0_pre8-whitelist-fixes.patch 1236 MD5 caf4f58ffd12206e0cdf22834afceb4f files/baselayout-1.12.0_pre8-usr-remount-ro.patch 502 +MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-1.12.0_pre8-whitelist-fixes.patch 1236 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13-r1 70 +MD5 6d5643e0857fc0f32f026e33d453c0c8 files/digest-baselayout-1.12.0_pre7-r1 75 +MD5 0f24c65f92bca9e5131d6ebd4ad6cfa0 files/digest-baselayout-1.12.0_pre8-r2 75 +MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDRbrvgIKl8Uu19MoRAj4jAJ0fBVwATGFmpaGk1fGnJ3+QV3oJBwCeKtWi +qPdEheTDtJfAVbsqDJ0xA/8= +=94bR +-----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild index 7cb037ec06d7..83963ad0dbe9 100644 --- a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.2 2005/09/04 19:38:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.3 2005/10/07 00:00:14 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -123,7 +123,7 @@ unkdir() { # Same as kdir above, but for symlinks #103618 ksym() { - echo "ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' " \ + echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \ >> "${D}"/usr/share/baselayout/mklinks.sh } diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild index fafdb9c4c805..ae289fa862f6 100644 --- a/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild,v 1.4 2005/09/06 20:04:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild,v 1.5 2005/10/07 00:00:14 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -135,7 +135,7 @@ unkdir() { # Same as kdir above, but for symlinks #103618 ksym() { - echo "ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' " \ + echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \ >> "${D}"/usr/share/baselayout/mklinks.sh } |