diff options
| author | Julian Andres Klode <jak@debian.org> | 2023-09-20 08:23:45 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2023-09-20 08:23:45 +0000 |
| commit | 7c21b90bde2cefeefe177e651c681a7b6b8f0053 (patch) | |
| tree | 7ab02a2a85efb413bc0c567e31d638dab45ed16d /apt-pkg | |
| parent | 4b6585f6107ecd68f9d90124f7ad11ae0e10baf1 (diff) | |
| parent | 925ada57d999a502dc2342092f32232b803be254 (diff) | |
Merge branch 'usrmerge-warning' into 'main'
Downgrade unmerged-usr from error to two warnings
See merge request apt-team/apt!307
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; |