diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-04-12 13:02:44 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-04-12 13:02:44 +0000 |
| commit | f06143cc26251bb1f902b590adebb7638167a0de (patch) | |
| tree | 64d3f51ce6b934255607e1385764b0ee0cba9fbc | |
| parent | 1a3927d2b72f1d2ac8ad54bc6bd7dd5850178b15 (diff) | |
| download | drakx-backup-do-not-use-f06143cc26251bb1f902b590adebb7638167a0de.tar drakx-backup-do-not-use-f06143cc26251bb1f902b590adebb7638167a0de.tar.gz drakx-backup-do-not-use-f06143cc26251bb1f902b590adebb7638167a0de.tar.bz2 drakx-backup-do-not-use-f06143cc26251bb1f902b590adebb7638167a0de.tar.xz drakx-backup-do-not-use-f06143cc26251bb1f902b590adebb7638167a0de.zip | |
fixed log of packdrake.
| -rw-r--r-- | perl-install/commands.pm | 3 | ||||
| -rw-r--r-- | perl-install/keyboard.pm | 6 | ||||
| -rw-r--r-- | perl-install/lang.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 3 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 10 |
5 files changed, 7 insertions, 17 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm index c4dd279d2..c6f8100e9 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -433,10 +433,9 @@ sub insmod { if (-e $cz) { eval { require packdrake; - my $packer = new packdrake($cz); + my $packer = new packdrake($cz, quiet => 1); $packer->extract_archive("/tmp", "$_.o"); }; - #run_program::run("packdrake -x $cz /tmp $_.o"); } elsif (-e "/lib/modules.cpio.bz2") { run_program::run("cd /tmp ; $ENV{LD_LOADER} bzip2 -cd /lib/modules.cpio.bz2 | $ENV{LD_LOADER} cpio -i $_.o"); } else { diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index b99942e79..be3f4761d 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -288,10 +288,9 @@ sub xmodmap_file { if (! -e $f) { eval { require packdrake; - my $packer = new packdrake("$ENV{SHARE_PATH}/xmodmap.cz2"); + my $packer = new packdrake("$ENV{SHARE_PATH}/xmodmap.cz2", quiet => 1); $packer->extract_archive("/tmp", "xmodmap.$keyboard"); }; - #run_program::run("packdrake", "-x", "$ENV{SHARE_PATH}/xmodmap.cz2", '/tmp', "xmodmap.$keyboard"); $f = "/tmp/xmodmap.$keyboard"; } -e $f && $f; @@ -307,7 +306,6 @@ sub setup { load(scalar cat_($f)); } else { local *F; - #open F, "packdrake -x $ENV{SHARE_PATH}/keymaps.cz2 '' $o->[1].bkmap |"; if (my $pid = open F, "-|") { local $/ = undef; eval { load(join('', <F>)) }; @@ -315,7 +313,7 @@ sub setup { } else { eval { require packdrake; - my $packer = new packdrake("$ENV{SHARE_PATH}/keymaps.cz2"); + my $packer = new packdrake("$ENV{SHARE_PATH}/keymaps.cz2", quiet => 1); $packer->extract_archive(undef, "$o->[1].bkmap"); }; c::_exit(0); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index d784b077e..a1f62802f 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -307,7 +307,7 @@ sub set { eval { commands::rm("-r", "$ENV{SHARE_PATH}/locale") }; eval { require packdrake; - my $packer = new packdrake("$ENV{SHARE_PATH}/locale.cz2"); + my $packer = new packdrake("$ENV{SHARE_PATH}/locale.cz2", quiet => 1); $packer->extract_archive("$ENV{SHARE_PATH}/locale", "UTF-8", $languages{$lang}[2]); }; } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 904e108ae..e53275f14 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -559,10 +559,9 @@ sub load_raw { } eval { require packdrake; - my $packer = new packdrake($cz); + my $packer = new packdrake($cz, quiet => 1); $packer->extract_archive("/tmp", map { "$_->[0].o" } @l); }; - #run_program::run("packdrake", "-x", $cz, "/tmp", map { "$_->[0].o" } @l); my @failed = grep { my $m = "/tmp/$_->[0].o"; if (-e $m && run_program::run(["/usr/bin/insmod_", "insmod"], '2>', '/dev/tty5', '-f', $m, @{$_->[1]})) { diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 77ead943b..3d143c8d7 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -121,13 +121,9 @@ sub extractHeaders($$$) { eval { require packdrake; - my $packer = new packdrake("/tmp/$medium->{hdlist}"); + my $packer = new packdrake("/tmp/$medium->{hdlist}", quiet => 1); $packer->extract_archive("$prefix/tmp/headers", map { packageHeaderFile($_) } @$pkgs); }; - #run_program::run("packdrake", "-x", - # "/tmp/$medium->{hdlist}", - # "$prefix/tmp/headers", - # map { packageHeaderFile($_) } @$pkgs); foreach (@$pkgs) { my $f = "$prefix/tmp/headers/". packageHeaderFile($_); @@ -425,11 +421,9 @@ sub psUsingHdlist { #- the archive too. eval { require packdrake; - my $packer = new packdrake($newf); + my $packer = new packdrake($newf, quiet => 1); foreach (@{$packer->{files}}) { $packer->{data}{$_}[0] eq 'f' or next; - #if (/^f\s+\d+\s+(.*)/) { - #my $pkg = [ (undef) x 8 ]; $pkg->[$FILE] = $1; $pkg->[$MEDIUM] = $m; my $pkg = [ (undef) x 8 ]; $pkg->[$FILE] = $_; $pkg->[$MEDIUM] = $m; my $specific_arch = packageArch($pkg); if (!$specific_arch || compat_arch($specific_arch)) { |