diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2023-09-20 09:46:51 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2023-09-20 09:47:47 +0200 |
| commit | 925ada57d999a502dc2342092f32232b803be254 (patch) | |
| tree | 7ab02a2a85efb413bc0c567e31d638dab45ed16d /apt-pkg | |
| parent | 4b6585f6107ecd68f9d90124f7ad11ae0e10baf1 (diff) | |
Downgrade unmerged-usr from error to two warnings
One warning will be issued before the Y/n prompt, the other will
be issued at the end after package installs have been attempted
or if there were other failures, such that the last line you see
is warnings about unmerged-usr
I do not anticipate this to be the final version either, but
there we go.
Closes: #1052058
Diffstat (limited to 'apt-pkg')
| -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 0e4cecd99..dbfa00bb3 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -557,7 +557,7 @@ bool Configuration::checkUsrMerged() if (stat(dirInUsr.c_str(), &usr)) continue; if (root.st_ino != usr.st_ino) - return _error->Error("%s resolved to a different inode than %s", dirInRoot.c_str(), dirInUsr.c_str()); + return _error->Warning("%s resolved to a different inode than %s", dirInRoot.c_str(), dirInUsr.c_str()), false; } return true; |