From ff7b403134687e4f5a1efb2c58455f137cb2f7d9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 9 Dec 2011 03:48:47 +0000 Subject: Also ignore warnings when trying to delete old .keep files if the rcscripts/ path doesn't even exist. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- sys-apps/baselayout/ChangeLog | 6 +++++- sys-apps/baselayout/Manifest | 10 +++++----- sys-apps/baselayout/baselayout-2.1.ebuild | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'sys-apps') diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 38b37eabedf9..d6c311bcb42f 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.516 2011/11/21 22:36:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.517 2011/12/09 03:48:47 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 09 Dec 2011; Mike Frysinger baselayout-2.1.ebuild: + Also ignore warnings when trying to delete old .keep files if the rcscripts/ + path doesn't even exist. + 21 Nov 2011; Mike Frysinger baselayout-2.1.ebuild: Trim old baselayout-1 dirs in /lib/. diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 5edd404f6a43..e1d64aaba3be 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -4,13 +4,13 @@ Hash: SHA256 DIST baselayout-2.0.3.tar.bz2 39969 RMD160 ca4ae235382780cd386c89f0147fbe17bb599414 SHA1 c5dbcc2d131254b2bb14b782101e2318d1dfcd2d SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd DIST baselayout-2.1.tar.bz2 40398 RMD160 bba874c5d3290848236703125c130107c1244f55 SHA1 84783a773ec050700b3b0ce4c7645ae878f7f7fb SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956 EBUILD baselayout-2.0.3.ebuild 7366 RMD160 579ac15844268e72cd9e1f593501e9a5806f4043 SHA1 3dcb7064e613d063fbe2428f7e3f57d92a2d9219 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4 -EBUILD baselayout-2.1.ebuild 7847 RMD160 5e0d52359ffa1f1dcf213ca88a6b915b6e317649 SHA1 80ef4952ed3b729af0053aa3e3a8289979d59d70 SHA256 22d9f4a282bdaaf5eb71b56168625e5fd50ce3e9b08ef1fca65ceb1ba8c18bbc -MISC ChangeLog 108074 RMD160 1f24755459b4536737b8f45a6a86e9ac93210e7a SHA1 778c773ca5bf5e28ac775bdb93394efb86f9c43b SHA256 d3e8c7511d492faa1d9dd8a3833f2056caf223be5876b0c63423e9d0199a7784 +EBUILD baselayout-2.1.ebuild 7859 RMD160 f2b0eaf614ee32adae2e8f5eb58639135a217c96 SHA1 5f63814cfa0833ce707449e217400085d26bf98f SHA256 0c161c2bc1df9bd3f462bb6ffabd45a86631917aa625ae2bc37d1daa58c6ad4b +MISC ChangeLog 108254 RMD160 0ecafe54584871f2c93615acff2095a7d14e49c9 SHA1 85d471e98aaade087010d63371d07f5e57281383 SHA256 7f6325c445c09e9b042c360bf3da3dff1aa16c1be045fbf4655998aacb486077 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7K0l0ACgkQaC/OocHi7JYkXwD+JGrgOa4hDnb+Y7ThQexfqqKM -EBV557ew2Cjopjm2wHgBAIgf9OhpbagsTKEHcp7Z/vR1gqJL8mqwMLuOA/KVvn4f -=nMxq +iF4EAREIAAYFAk7hhS4ACgkQaC/OocHi7JaGawD7BnU4XLDwDcYIxbvxw9UrlffJ +9hdyNh3+FolTiw3qUpsBAKAJUoAbr1OIyVCqfKFjxkwCmtlTrMv2gS2a+Er6zLf/ +=qH5K -----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild index a81c341353e1..75e607254b29 100644 --- a/sys-apps/baselayout/baselayout-2.1.ebuild +++ b/sys-apps/baselayout/baselayout-2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.5 2011/11/21 22:36:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.6 2011/12/09 03:48:47 vapier Exp $ inherit eutils multilib @@ -209,7 +209,7 @@ pkg_postinst() { fi # baselayout leaves behind a lot of .keep files, so let's clean them up - find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + + find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null # whine about users with invalid shells #215698 -- cgit v1.2.3-65-gdbad