diff options
author | Niels Thykier <niels@thykier.net> | 2017-11-04 16:18:21 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2017-11-04 16:18:21 +0000 |
commit | 203f573937dcc6353b9c8b054770b1debbf1e7fb (patch) | |
tree | 975dae95b6a6102daccbc9d1e38261b4f2bd293f /dh_installsystemd | |
parent | 7424670086d6ad7f90b8b13accae52ef3d4b6110 (diff) | |
download | debhelper-203f573937dcc6353b9c8b054770b1debbf1e7fb.tar.gz |
dh_installsystemd: Optimize the tmpfiles search
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'dh_installsystemd')
-rwxr-xr-x | dh_installsystemd | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dh_installsystemd b/dh_installsystemd index 2ab6dfbd..671fb480 100755 --- a/dh_installsystemd +++ b/dh_installsystemd @@ -332,18 +332,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Include postinst-init-tmpfiles if the package ships any files # in /usr/lib/tmpfiles.d or /etc/tmpfiles.d if (-d $tmpdir) { + my @dirs = grep { -d } map { "${tmpdir}/$_" } qw(usr/lib/tmpfiles.d etc/tmpfiles.d); find({ wanted => sub { my $name = $File::Find::name; return unless -f $name; $name =~ s/^\Q$tmpdir\E//g; - if ($name =~ m,^/usr/lib/tmpfiles\.d/, || - $name =~ m,^/etc/tmpfiles\.d/,) { - push @tmpfiles, $name; - } + push(@tmpfiles, $name); }, no_chdir => 1, - }, $tmpdir); + }, @dirs) if @dirs; if (@tmpfiles > 0) { autoscript($package, 'postinst', 'postinst-init-tmpfiles', { 'TMPFILES' => join(' ', sort @tmpfiles) }); } |