summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:28:15 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:28:15 +0000
commit74420e9c816fa82492c04cb1e0bab516eef3f52e (patch)
tree3cd038205cb33e037e497fb66b5607103dba172b /perl-install
parent25ddc19cf510cdca4c089f9c0060a25b26f75c8f (diff)
downloaddrakx-backup-do-not-use-74420e9c816fa82492c04cb1e0bab516eef3f52e.tar
drakx-backup-do-not-use-74420e9c816fa82492c04cb1e0bab516eef3f52e.tar.gz
drakx-backup-do-not-use-74420e9c816fa82492c04cb1e0bab516eef3f52e.tar.bz2
drakx-backup-do-not-use-74420e9c816fa82492c04cb1e0bab516eef3f52e.tar.xz
drakx-backup-do-not-use-74420e9c816fa82492c04cb1e0bab516eef3f52e.zip
(parse_args,empty_packages) add support for 'justdb' option
(for fast testing; warning: no coverage for %post scripts errors or missing requires, non explicit file conflicts, ...) (installPackages) don't try to run ldconfig in 'justdb' mode (configureNetwork) don't try to set firewall, file tests will fail (afterInstallPackages) don't check for file
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm1
-rw-r--r--perl-install/install/pkgs.pm1
-rw-r--r--perl-install/install/steps.pm7
4 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0fd3e5ed2..17b556084 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,8 @@
- kill last remanents of kernel-2.4.x support
- package group selection:
o remember minimal install values when clicking "previous"
+- packages installation:
+ o add support for 'justdb' option
- refactoring
Version 14.22 - 15 May 2012
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 6c33fbf2b..55ab5a79d 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -485,6 +485,7 @@ sub parse_args {
no_bad_drives => sub { $o->{partitioning}{no_bad_drives} = 1 },
nodmraid => sub { $o->{partitioning}{nodmraid} = 1 },
debug_urpmi => sub { $o->{debug_urpmi} = 1 },
+ justdb => sub { $o->{justdb} = 1 },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },
askdisplay => sub { print "Please enter the X11 display to perform the install on ? "; $o->{display} = chomp_(scalar(<STDIN>)) },
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index e8f1e264e..a9a17d4f1 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -385,6 +385,7 @@ sub empty_packages {
$packages->{keep_unrequested_dependencies} =
defined($o_keep_unrequested_dependencies) ? $o_keep_unrequested_dependencies : 1;
$urpm::args::options{force_transactions} = 1;
+ $urpm::args::options{justdb} = $::o->{justdb};
$::force = 1;
$packages->{options}{ignoresize} = 1;
# prevent priority upgrade (redundant for now as $urpm->{root} implies disabling it:
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 85de324cb..1d0822dee 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -442,7 +442,7 @@ sub installPackages {
}
any::writeandclean_ldsoconf($::prefix);
- run_program::rooted_or_die($::prefix, 'ldconfig');
+ run_program::rooted_or_die($::prefix, 'ldconfig') if !$o->{justdb};
log::l("Install took: ", formatTimeRaw(time() - $time));
install::media::log_sizes();
@@ -459,7 +459,7 @@ Either your cdrom drive or your cdrom is defective.
Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"
") if any { m|read failed: Input/output error| } cat_("$::prefix/root/drakx/install.log");
- if (arch() !~ /^sparc/) { #- TODO restore it as may be needed for sparc
+ if (arch() !~ /^sparc/ && !$o->{justdb}) { #- TODO restore it as may be needed for sparc
-x "$::prefix/usr/bin/dumpkeys" or $::testing or die
"Some important packages did not get installed properly.
@@ -644,7 +644,8 @@ sub configureNetwork {
my ($o) = @_;
require network::network;
network::network::configure_network($o->{net}, $o, $o->{modules_conf});
- configure_firewall($o) if !$o->{isUpgrade};
+
+ configure_firewall($o) if !$o->{isUpgrade} && !$o->{justdb};
#- only a http proxy can be used by stage1
#- the method is http even for ftp connections through a http proxy