diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
| commit | e110d7bf5675f484c06b82f621ac98bedc464865 (patch) | |
| tree | 70ce5da7ad75ccbaf4b30cf4809209993ba98b23 /apt-pkg/aptconfiguration.cc | |
| parent | 0b58b3f8917a49d83154fd3173bca36c1d617ef0 (diff) | |
| parent | 4f6d26b4d41474aa390329b7e9cb167eb70b2821 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
Diffstat (limited to 'apt-pkg/aptconfiguration.cc')
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 9982759c6..94b6bc246 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -540,7 +540,7 @@ std::string const Configuration::getBuildProfilesString() { return ""; std::vector<std::string>::const_iterator p = profiles.begin(); std::string list = *p; - for (; p != profiles.end(); ++p) + for (++p; p != profiles.end(); ++p) list.append(",").append(*p); return list; } |