[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: RFS: tomcat7 7.0.28-2 (fixes RC bug)



On 07/10/2012 12:33 PM, Niels Thykier wrote:
> On 2012-07-10 21:02, Jakub Adam wrote:
>> Hi Niels,
>>
>> On 10.7.2012 20:46, Niels Thykier wrote:
>>> Looks okay, but can you remove the
>>>     <srcfiles file="${user.home}/build.properties" />
>>> line rather adding "failonerror=false"?  I do not like the idea of the
>>> build being sensitive to stuff in $HOME.
>>
>> Changed in git.
>>
>> Regards,
>>
>> Jakub
>>
>>
> 
> It seems the build changes d/tomcat7.postrm, but the clean rule does not
> "undo it".  So this would produce the wrong result if rebuilt.  It seems
> unrelated to your change, which effectively makes it an unreported RC bug.
> 
> diff --git a/debian/tomcat7.postrm b/debian/tomcat7.postrm
> index 1d451c3..99236af 100644
> --- a/debian/tomcat7.postrm
> +++ b/debian/tomcat7.postrm
> @@ -14,7 +14,7 @@ case "$1" in
>          RWLOC="/var/lib/tomcat7/webapps/ROOT"
>          RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
>          if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
> -                            = "@ROOT_WEBAPP_MD5SUM@" ] ; then
> +                            = "0688719927c9ff0b364d2b5bc1eea542" ] ; then
>              rm $RWFILES
>              rmdir --ignore-fail-on-non-empty \
>                  /var/lib/tomcat7/webapps/ROOT/META-INF \
> 
> ~Niels

Hi Niels,

I changed the build to calculate the MD5SUM needed in the postrm because
packages would forget to modify the sum after modifying the app and
reintroduce a piuparts error (see #670440).  I see now how this creates
a problem when building twice in a row, but only in the case that the
contents of the root webapp were modified.  (Otherwise the MD5SUm is
correct and @ROOT_WEBAPP_MD5SUM@ isn't matched or replaced.)  Is that an
RC bug?

I can update the build to use a postrm.in file if this is RC.

Thanks,
tony



Reply to: