diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-12-04 11:53:05 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-12-04 11:53:05 +0000 |
| commit | b9d405d4074bb1de10e869038fe9685bf660fd16 (patch) | |
| tree | 515811c1baa6f296f2b5e78fcfeb2ddb6cf38aa7 /apt-pkg | |
| parent | dbf202ff9d20a043855d41f4bea1d954b0cef579 (diff) | |
| parent | 64d7e1c568a7f9e7f32d1dee1ab771f924baa28d (diff) | |
Merge branch 'bugfix/spaceinconfig' into 'master'
Use quoted tagnames in config dumps
See merge request apt-team/apt!32
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/cdrom.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 2c3979ff9..151608b28 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -438,7 +438,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf) /* Write out all of the configuration directives by walking the configuration tree */ - Cnf.Dump(Out, NULL, "%f \"%v\";\n", false); + Cnf.Dump(Out, NULL, "%F \"%v\";\n", false); Out.close(); diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 76d1b9370..1c000e586 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -728,7 +728,7 @@ bool Configuration::ExistsAny(const char *Name) const /* Dump the entire configuration space */ void Configuration::Dump(ostream& str) { - Dump(str, NULL, "%f \"%v\";\n", true); + Dump(str, NULL, "%F \"%v\";\n", true); } void Configuration::Dump(ostream& str, char const * const root, char const * const formatstr, bool const emptyValue) |