From 78b3bc4105484cd413c16f61d3d91e34eab5ad11 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 18 Feb 2009 12:58:06 +0000 Subject: (rpmDbOpen) make it more readable --- perl-install/install/pkgs.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'perl-install/install') diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 7b2937c16..0b16968d1 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -559,9 +559,15 @@ sub rpmDbOpen { } else { log::l("rebuilding rpm database"); my $rebuilddb_dir = "$::prefix/var/lib/rpmrebuilddb.$$"; - -d $rebuilddb_dir and log::l("removing stale directory $rebuilddb_dir"), rm_rf($rebuilddb_dir); + if (-d $rebuilddb_dir) { + log::l("removing stale directory $rebuilddb_dir"); + rm_rf($rebuilddb_dir); + } - URPM::DB::rebuild($::prefix) or log::l("rebuilding of rpm database failed: " . URPM::rpmErrorString()), c::_exit(2); + if (!URPM::DB::rebuild($::prefix)) { + log::l("rebuilding of rpm database failed: " . URPM::rpmErrorString()); + c::_exit(2); + } c::_exit(0); } -- cgit v1.2.1