diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-11-14 19:02:34 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-11-14 19:02:34 +0000 |
| commit | 6ee247f4e5130a348c46ed385a0f405f32cc92d4 (patch) | |
| tree | a6eae68423219a297bb41e2a558e885f733fb043 /apt-pkg | |
| parent | f7fb7fb921c3bbfa0ef086b0cc9343d126d0ed09 (diff) | |
| parent | fdd846cd67def08f04cc616530adc144fc5435d7 (diff) | |
Merge branch 'append' into 'main'
(+=)+= -> append().append()
See merge request apt-team/apt!398
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 8 | ||||
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index bd7076701..bb3422bcb 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -755,9 +755,11 @@ string flCombine(string Dir,string File) return File; if (File.length() >= 2 && File[0] == '.' && File[1] == '/') return File; - if (Dir[Dir.length()-1] == '/') - return Dir += File; - return (Dir += '/') += File; + + if (Dir.back() != '/') + Dir.append("/"); + Dir.append(File); + return Dir; } /*}}}*/ // flAbsPath - Return the absolute path of the filename /*{{{*/ diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 3f37d2134..c9e31c645 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -846,7 +846,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, // … but this is probably the best thing to do anyway if (Package.substr(found + 1) == "native") { - std::string const Pkg = (std::string{Package.substr(0, found)} += ':') += Ver.Cache()->NativeArch(); + std::string const Pkg = std::string{Package, 0, found}.append(":").append(Ver.Cache()->NativeArch()); if (NewDepends(Ver, Pkg, "any", Version, Op | pkgCache::Dep::ArchSpecific, Type) == false) return false; } diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 03221ce32..650e259ef 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -761,7 +761,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line) char* buf = NULL; size_t bufsize = 0; if (getline(&buf, &bufsize, dpkg) != -1) - (pkgname += ':') += buf; + pkgname.append(":").append(buf); free(buf); fclose(dpkg); } @@ -2376,7 +2376,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) pkgver = Ver.VerStr() == NULL ? "unknown" : Ver.VerStr(); // if the file exists already, we check: - // - if it was reported already (touched by apport). + // - if it was reported already (touched by apport). // If not, we do nothing, otherwise // we overwrite it. This is the same behaviour as apport // - if we have a report with the same pkgversion already |