diff options
| author | Julian Andres Klode <jak@debian.org> | 2021-01-08 20:48:44 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2021-01-08 20:48:44 +0000 |
| commit | cf2a4ba58c628d15fb308e9a12212e0f11eb27ed (patch) | |
| tree | 0bbba56e54b5ccd677ce7e580203c365e8d8b1a7 | |
| parent | 2ba639f71736067b53903f11c8c75e9701972c3f (diff) | |
| parent | 24984ac47b0172400e575ad44ed60bb22543298b (diff) | |
Merge branch 'pu/small-fixes' into 'master'
Pu/small fixes
See merge request apt-team/apt!151
| -rw-r--r-- | apt-pkg/algorithms.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index a8e198054..260a8ac41 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1564,19 +1564,19 @@ std::string GetProtectedKernelsRegex(pkgCache *cache, bool ReturnRemove) if (not bootedVersion.empty()) { - if (Debug || false) + if (Debug) std::clog << "Keeping booted kernel " << bootedVersion << std::endl; keep.insert(bootedVersion); } if (not lastInstalledVersion.empty()) { - if (Debug || false) + if (Debug) std::clog << "Keeping installed kernel " << lastInstalledVersion << std::endl; keep.insert(lastInstalledVersion); } if (latest != version2unames.rend()) { - if (Debug || false) + if (Debug) std::clog << "Keeping latest kernel " << latest->first << std::endl; keep.insert(latest->first); } diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index b3b423fdc..e88029f58 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -481,7 +481,7 @@ std::string const Configuration::getBuildProfilesString() { } /*}}}*/ -// getMachineID - supported data.tar extensions /*{{{*/ +// getMachineID - read /etc/machine-id into a string /*{{{*/ // --------------------------------------------------------------------- /* */ std::string const Configuration::getMachineID() |