summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-03-13 18:28:03 +0000
committerFrancois Pons <fpons@mandriva.com>2000-03-13 18:28:03 +0000
commit9266168309a593e84c47cc59edb2a6ccd49e4686 (patch)
tree826858473eae15b943e73ba3980af2417378bf08 /perl-install
parentf39f307ded336dddb9a4767b1128b82471446412 (diff)
downloaddrakx-backup-do-not-use-9266168309a593e84c47cc59edb2a6ccd49e4686.tar
drakx-backup-do-not-use-9266168309a593e84c47cc59edb2a6ccd49e4686.tar.gz
drakx-backup-do-not-use-9266168309a593e84c47cc59edb2a6ccd49e4686.tar.bz2
drakx-backup-do-not-use-9266168309a593e84c47cc59edb2a6ccd49e4686.tar.xz
drakx-backup-do-not-use-9266168309a593e84c47cc59edb2a6ccd49e4686.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog16
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/pkgs.pm8
3 files changed, 20 insertions, 5 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 06f1f5a71..7237ea35d 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,14 @@
+2000-03-13 François Pons <fpons@mandrakesoft.com>
+
+ * pkgs.pm, install_any.pm: small correction for multiple media
+ installation.
+ * tools/syncrpms: added for handling synchronisation of multiple source
+ rpm directories (and multiple target), include cleaning.
+ * tools/closurepkgs: tools to get rpm that may be installed by DrakX
+ after normal packages installation (printer, network, X11...), may
+ be used to duplicate on other CD some important stuff of the first
+ one.
+
2000-03-11 Pixel <pixel@mandrakesoft.com>
* devices.pm (set_loop): created, searches for an available
@@ -9,6 +20,11 @@
message, otherwise silly gtk won't do anything and we'll wait
forever :(
+2000-03-10 François Pons <fpons@mandrakesoft.com>
+
+ * *.pm: heavy modification to take into account multiple media
+ installation.
+
2000-03-10 Pixel <pixel@mandrakesoft.com>
* install2.pm (@install_classes): cleanup, no more i18n (is now in
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 41a46f93b..1b908e062 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -35,7 +35,6 @@ use log;
$current_medium = '';
$asked_medium = '';
%refused_media = ();
-sub medium() { $current_medium }
sub useMedium($) { $asked_medium eq $_[0] or log::l("selecting new medium $_[0]"); $asked_medium = $_[0] }
sub changeMedium($$) {
my ($method, $medium) = @_;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index c6d7f402e..43dca813c 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -86,9 +86,9 @@ $PKGS_UNSKIP = 0x10000000;
#- size and deps are grouped to save memory too and make a much
#- simpler and faster depslist reader, this gets (sizeDeps).
sub packageHeaderFile { my ($pkg) = @_; $pkg->{file} }
-sub packageName { my ($pkg) = @_; $pkg->{file} =~ /(.*)-[^-]+-[^-]+/ && $1 or die "invalid file `$pkg->{file}'" }
-sub packageVersion { my ($pkg) = @_; $pkg->{file} =~ /.*-([^-]+)-[^-]+/ && $1 or die "invalid file `$pkg->{file}'" }
-sub packageRelease { my ($pkg) = @_; $pkg->{file} =~ /.*-[^-]+-([^-]+)/ && $1 or die "invalid file `$pkg->{file}'" }
+sub packageName { my ($pkg) = @_; $pkg->{file} =~ /(.*)-[^-]+-[^-]+/ ? $1 : die "invalid file `$pkg->{file}'" }
+sub packageVersion { my ($pkg) = @_; $pkg->{file} =~ /.*-([^-]+)-[^-]+/ ? $1 : die "invalid file `$pkg->{file}'" }
+sub packageRelease { my ($pkg) = @_; $pkg->{file} =~ /.*-[^-]+-([^-]+)/ ? $1 : die "invalid file `$pkg->{file}'" }
sub packageSize { my ($pkg) = @_; to_int($pkg->{sizeDeps}) }
sub packageDepsId { my ($pkg) = @_; split ' ', ($pkg->{sizeDeps} =~ /^\d*\s+(.*)/)[0] }
@@ -752,7 +752,7 @@ sub install($$$;$$) {
#- place (install_steps_gtk.pm,...).
installCallback("Starting installation", $nb, $total);
- my ($i, $min, $medium) = (0, 0, install_any::medium());
+ my ($i, $min, $medium) = (0, 0);
do {
my @transToInstall;