Dnia 2015-06-12, o godz. 01:44:17 "Davide Pesavento (pesa)" <[email protected]> napisał(a):
> pesa 15/06/12 01:44:17 > > Modified: ChangeLog qt4-build-multilib.eclass > Log: > Don't die when trying to rmdir non-existent directory (bug 551676). > > Revision Changes Path > 1.1653 eclass/ChangeLog > > file : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653&view=markup > plain: > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653&content-type=text/plain > diff : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1652&r2=1.1653 > > Index: ChangeLog > =================================================================== > RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v > retrieving revision 1.1652 > retrieving revision 1.1653 > diff -u -r1.1652 -r1.1653 > --- ChangeLog 11 Jun 2015 18:33:54 -0000 1.1652 > +++ ChangeLog 12 Jun 2015 01:44:17 -0000 1.1653 > @@ -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 <[email protected]> qt4-build-multilib.eclass: > + Don't die when trying to rmdir non-existent directory (bug 551676). > > 11 Jun 2015; Davide Pesavento <[email protected]> qt4-build-multilib.eclass: > Use usex(). > > > > 1.21 eclass/qt4-build-multilib.eclass > > file : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21&view=markup > plain: > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21&content-type=text/plain > diff : > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.20&r2=1.21 > > Index: qt4-build-multilib.eclass > =================================================================== > RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v > retrieving revision 1.20 > retrieving revision 1.21 > diff -u -r1.20 -r1.21 > --- qt4-build-multilib.eclass 11 Jun 2015 18:33:54 -0000 1.20 > +++ qt4-build-multilib.eclass 12 Jun 2015 01:44:17 -0000 1.21 > @@ -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 @@ > 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 And now you're doing a QA violation. Just don't call rmdir if something doesn't exist instead of ignoring the result and letting it spit random errors, all into 'did not exist' basket. -- Best regards, Michał Górny
pgpEBVLW2TJi0.pgp
Description: OpenPGP digital signature
