From 5af3bd95ac2d397e57145ac3ac7ca1a889ebe59d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 3 Aug 2011 17:26:14 +0200 Subject: [PATCH] [matter] always check for preserved libs, even when --gentle is not specified --- services/matter | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services/matter b/services/matter index cda26059e..f2d0c2051 100755 --- a/services/matter +++ b/services/matter @@ -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)