diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-12 01:44:17 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-12 01:44:17 +0000 |
| commit | 92cfdc6e176eaaed692424a14a55db476f681607 (patch) | |
| tree | a27cdd00311652a5721265fcec282035f3eab48a /eclass | |
| parent | Version bump. (diff) | |
| download | historical-92cfdc6e176eaaed692424a14a55db476f681607.tar.gz historical-92cfdc6e176eaaed692424a14a55db476f681607.tar.bz2 historical-92cfdc6e176eaaed692424a14a55db476f681607.zip | |
Don't die when trying to rmdir non-existent directory (bug 551676).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 55f394324e44..3b5e1562aa4b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11 18:33:54 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1653 2015/06/12 01:44:17 pesa Exp $ + + 12 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: + Don't die when trying to rmdir non-existent directory (bug 551676). 11 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: Use usex(). diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 68971a25372f..fe8f0d43c9d6 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20 2015/06/11 18:33:54 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21 2015/06/12 01:44:17 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -470,7 +470,7 @@ qt4_multilib_src_install() { mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die done eshopts_pop - rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die + rmdir "${D}/${QT4_LIBDIR}"/pkgconfig qt4_install_module_qconfigs qt4_symlink_framework_headers |