1 |
On Fri, Jun 12, 2015 at 6:43 AM, Michał Górny <mgorny@g.o> wrote: |
2 |
> Dnia 2015-06-12, o godz. 01:44:17 |
3 |
> "Davide Pesavento (pesa)" <pesa@g.o> napisał(a): |
4 |
> |
5 |
>> pesa 15/06/12 01:44:17 |
6 |
>> |
7 |
>> Modified: ChangeLog qt4-build-multilib.eclass |
8 |
>> Log: |
9 |
>> Don't die when trying to rmdir non-existent directory (bug 551676). |
10 |
>> |
11 |
>> Revision Changes Path |
12 |
>> 1.1653 eclass/ChangeLog |
13 |
>> |
14 |
>> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653&view=markup |
15 |
>> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653&content-type=text/plain |
16 |
>> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1652&r2=1.1653 |
17 |
>> |
18 |
>> Index: ChangeLog |
19 |
>> =================================================================== |
20 |
>> RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
21 |
>> retrieving revision 1.1652 |
22 |
>> retrieving revision 1.1653 |
23 |
>> diff -u -r1.1652 -r1.1653 |
24 |
>> --- ChangeLog 11 Jun 2015 18:33:54 -0000 1.1652 |
25 |
>> +++ ChangeLog 12 Jun 2015 01:44:17 -0000 1.1653 |
26 |
>> @@ -1,6 +1,9 @@ |
27 |
>> # ChangeLog for eclass directory |
28 |
>> # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
29 |
>> -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11 18:33:54 pesa Exp $ |
30 |
>> +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1653 2015/06/12 01:44:17 pesa Exp $ |
31 |
>> + |
32 |
>> + 12 Jun 2015; Davide Pesavento <pesa@g.o> qt4-build-multilib.eclass: |
33 |
>> + Don't die when trying to rmdir non-existent directory (bug 551676). |
34 |
>> |
35 |
>> 11 Jun 2015; Davide Pesavento <pesa@g.o> qt4-build-multilib.eclass: |
36 |
>> Use usex(). |
37 |
>> |
38 |
>> |
39 |
>> |
40 |
>> 1.21 eclass/qt4-build-multilib.eclass |
41 |
>> |
42 |
>> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21&view=markup |
43 |
>> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21&content-type=text/plain |
44 |
>> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.20&r2=1.21 |
45 |
>> |
46 |
>> Index: qt4-build-multilib.eclass |
47 |
>> =================================================================== |
48 |
>> RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v |
49 |
>> retrieving revision 1.20 |
50 |
>> retrieving revision 1.21 |
51 |
>> diff -u -r1.20 -r1.21 |
52 |
>> --- qt4-build-multilib.eclass 11 Jun 2015 18:33:54 -0000 1.20 |
53 |
>> +++ qt4-build-multilib.eclass 12 Jun 2015 01:44:17 -0000 1.21 |
54 |
>> @@ -1,6 +1,6 @@ |
55 |
>> # Copyright 1999-2015 Gentoo Foundation |
56 |
>> # Distributed under the terms of the GNU General Public License v2 |
57 |
>> -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20 2015/06/11 18:33:54 pesa Exp $ |
58 |
>> +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21 2015/06/12 01:44:17 pesa Exp $ |
59 |
>> |
60 |
>> # @ECLASS: qt4-build-multilib.eclass |
61 |
>> # @MAINTAINER: |
62 |
>> @@ -470,7 +470,7 @@ |
63 |
>> mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die |
64 |
>> done |
65 |
>> eshopts_pop |
66 |
>> - rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die |
67 |
>> + rmdir "${D}/${QT4_LIBDIR}"/pkgconfig |
68 |
>> |
69 |
>> qt4_install_module_qconfigs |
70 |
>> qt4_symlink_framework_headers |
71 |
> |
72 |
> And now you're doing a QA violation. Just don't call rmdir if something |
73 |
> doesn't exist instead of ignoring the result and letting it spit |
74 |
> random errors, all into 'did not exist' basket. |
75 |
|
76 |
Wow. "QA violation". Sounds quite exaggerated don't you think? |
77 |
Especially if you consider that the rmdir without die has been present |
78 |
in qt4-build.eclass for many years, and got recently copied over to |
79 |
qt4-build-multilib.eclass, and no one said anything. |
80 |
|
81 |
Anyway, fear not, I'm going to rewrite that piece of code very soon. |
82 |
The removal of "|| die" is just supposed to be a quick fix for the |
83 |
regression, not a long term solution. |
84 |
|
85 |
Cheers, |
86 |
Davide |