From d43b1a03db9e17c69a15b2838fde69450764727a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 8 Jan 2021 18:02:10 +0100 Subject: Fix getMachineID copy-paste error Gbp-Dch: ignore --- apt-pkg/aptconfiguration.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg') 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() -- cgit v1.2.3 From 24984ac47b0172400e575ad44ed60bb22543298b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 8 Jan 2021 18:03:08 +0100 Subject: kernels: remove spurious || false Gbp-Dch: ignore --- apt-pkg/algorithms.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg') 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); } -- cgit v1.2.3