[matter] always check for preserved libs, even when --gentle is not specified

This commit is contained in:
Fabio Erculiani
2011-08-03 17:26:14 +02:00
parent eda3c0298b
commit 5af3bd95ac

View File

@@ -1022,6 +1022,13 @@ Environment variables passed to --pkgpre/--pkgpost executables:
with EntropyResourceLock(entropy_server, nsargs.blocking):
preserved_libs = \
PackageBuilder.check_preserved_libraries()
if preserved_libs:
print_error(
"preserved libraries are found on system, aborting.")
raise SystemExit(7)
if nsargs.gentle:
# check if there is something to do
to_be_added, to_be_removed, to_be_injected = \
@@ -1041,13 +1048,6 @@ Environment variables passed to --pkgpre/--pkgpost executables:
"some configuration files have to be merged manually")
raise SystemExit(6)
preserved_libs = \
PackageBuilder.check_preserved_libraries()
if preserved_libs:
print_error(
"preserved libraries are found on system, aborting.")
raise SystemExit(7)
# setup
if nsargs.pre:
rc = PackageBuilder.setup(nsargs.pre, cwd)