[debhelper-devel] [debhelper] 01/01: dh_systemd_start: Regex escape paths used in regex

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit bb1bb4bef459ebe08a535c01c4bdb086b7a40892
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Oct 4 18:48:32 2017 +0000

    dh_systemd_start: Regex escape paths used in regex
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 1 +
 dh_systemd_start | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 602f6fe..1a64363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ debhelper (10.9.1) UNRELEASED; urgency=medium
   * dh_installdocs: Validate that the package passed to
     --doc-main-package are listed in debian/control.
   * dh_installexamples: Ditto.
+  * dh_systemd_start: Regex escape two paths used in a regex.
 
   [ Dmitry Shachnev ]
   * qmake.pm: Add basic cross-building support.  (Closes: #877357)
diff --git a/dh_systemd_start b/dh_systemd_start
index 5c0297c..0a04874 100755
--- a/dh_systemd_start
+++ b/dh_systemd_start
@@ -140,10 +140,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		wanted => sub {
 			my $name = $File::Find::name;
 			return unless -f;
-			return unless $name =~ m,^$tmpdir/lib/systemd/system/[^/]+$,;
+			return unless $name =~ m,^\Q${tmpdir}\E/lib/systemd/system/[^/]+$,;
 			if (-l) {
 				my $target = abs_path(readlink());
-				$target =~ s,^$oldcwd/,,g;
+				$target =~ s,^\Q${oldcwd}\E/,,g;
 				$aliases{$target} = [ $_ ];
 			} else {
 				push @installed_units, $name;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git