summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-02-04 01:08:50 +0100
committerJulian Andres Klode <jak@debian.org>2016-02-04 01:08:50 +0100
commit9ffba52025237c89bcca5de06722729172fe1aea (patch)
treee99790ddcdce92f210651ceaa3182156305bee7a /apt-pkg/contrib
parentef72d726399763446f31a07b11f30f6a726ea81a (diff)
parent732510fef9af5addc5e3ff1a79ce8c9658711fb6 (diff)
Merge branch 'master' of github.com:adrian17/apt
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/strutl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 5e641a02b..242a78449 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -464,7 +464,9 @@ string SubstVar(const string &Str,const string &Subst,const string &Contents)
if (OldPos >= Str.length())
return Temp;
- return Temp + string(Str,OldPos);
+
+ Temp.append(Str, OldPos, string::npos);
+ return Temp;
}
string SubstVar(string Str,const struct SubstVar *Vars)
{