Joey Hess <[EMAIL PROTECTED]> writes:
> Matej Vela wrote:
>> --- debhelper-5.0.2.orig/dh_clean
>> +++ debhelper-5.0.2/dh_clean
>> @@ -99,8 +99,8 @@
>> \\) $find_options -exec rm -f {} \\;");
>>
>> # Stupid autoconf cache directory.
>> - doit("rm", "-rf", "autom4te.cache")
>> - unless excludefile("autom4te.cache");
>> + complex_doit("find . -type d -a -name autom4te.cache \\
>> + $find_options -prune -exec rm -rf {} \\;");
>> }
>>
>> doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) &&
>
> I'm not sure that the fairly rare case of automake subdirs is worth the
> added overhead of running a second find through the whole source tree.
Good point. This patch does everything in the first find:
--- debhelper-5.0.2.orig/dh_clean
+++ debhelper-5.0.2/dh_clean
@@ -91,16 +91,13 @@
}
# Remove other temp files.
- complex_doit("find . -type f -a \\
+ complex_doit("find . \\( \\( -type f -a \\
\\( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \\
-o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \\
-o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \\
-o -name TAGS -o -name core -o \\( -path '*/.deps/*' -a -name
'*.P' \\) \\
- \\) $find_options -exec rm -f {} \\;");
-
- # Stupid autoconf cache directory.
- doit("rm", "-rf", "autom4te.cache")
- unless excludefile("autom4te.cache");
+ \\) \\) -o \\( -type d -a -name autom4te.cache \\) \\) \\
+ $find_options -prune -exec rm -rf {} \\;");
}
doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) &&
> Also, the patch doesn't support -X
(It did, it used $find_options from the previous invocation.)
Thanks,
Matej
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
