about summary refs log tree commit diff
path: root/src/libexpr/names.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-10-19T14·32+0200
committerEelco Dolstra <edolstra@gmail.com>2016-10-19T14·32+0200
commit795d9b866881871419651081eb112f23b2f5bff5 (patch)
treee51077f7170bb04bb003fdadcd0e462bc52d9776 /src/libexpr/names.cc
parent19c278de89fa60844fa1ea2b3c2abfa639f75b39 (diff)
parentc935e8eeaf3ef5f49f66468ba551fd016fd76aa0 (diff)
Merge branch 'regex' of https://github.com/groxxda/nix
Diffstat (limited to 'src/libexpr/names.cc')
-rw-r--r--src/libexpr/names.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/names.cc b/src/libexpr/names.cc
index 7bca9b6550be..6d78d2116121 100644
--- a/src/libexpr/names.cc
+++ b/src/libexpr/names.cc
@@ -33,8 +33,8 @@ DrvName::DrvName(const string & s) : hits(0)
 bool DrvName::matches(DrvName & n)
 {
     if (name != "*") {
-        if (!regex) regex = std::shared_ptr<Regex>(new Regex(name));
-        if (!regex->matches(n.name)) return false;
+        if (!regex) regex = std::unique_ptr<std::regex>(new std::regex(name, std::regex::extended));
+        if (!std::regex_match(n.name, *regex)) return false;
     }
     if (version != "" && version != n.version) return false;
     return true;