diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-10-08 11:42:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-10-08 11:42:45 +0000 |
| commit | 0f48e147d39575f98db29f7e21d5347e6e309d04 (patch) | |
| tree | fba03e3d6c57d3b202f973fc11907372dd26f64e /perl-install/pkgs.pm | |
| parent | c5a4cbe6c55d38bcc411bd94f088f36b85681899 (diff) | |
| download | drakx-backup-do-not-use-0f48e147d39575f98db29f7e21d5347e6e309d04.tar drakx-backup-do-not-use-0f48e147d39575f98db29f7e21d5347e6e309d04.tar.gz drakx-backup-do-not-use-0f48e147d39575f98db29f7e21d5347e6e309d04.tar.bz2 drakx-backup-do-not-use-0f48e147d39575f98db29f7e21d5347e6e309d04.tar.xz drakx-backup-do-not-use-0f48e147d39575f98db29f7e21d5347e6e309d04.zip | |
no_comment
Diffstat (limited to 'perl-install/pkgs.pm')
| -rw-r--r-- | perl-install/pkgs.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 8570e2e07..51cf3f0f7 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -116,7 +116,7 @@ sub psUsingDirectory() { log::l("scanning $dirname for packages"); foreach (all("$dirname")) { - my ($name, $version, $release) = /(.*)-([^-]+)-([^-.]+)\.[^.]+\.rpm/ or log::l("skipping $_"), next; + my ($name, $version, $release) = /(.*)-([^-]+)-([^-]+)\.[^.]+\.rpm/ or log::l("skipping $_"), next; $packages{$name} = { name => $name, version => $version, release => $release, @@ -151,7 +151,7 @@ sub psUsingHdlist() { } sub chop_version($) { - first($_[0] =~ /(.*)-[^-]+-[^-.]+/) || $_[0]; + first($_[0] =~ /(.*)-[^-]+-[^-]+/) || $_[0]; } sub getDeps($) { @@ -420,6 +420,7 @@ sub install($$) { $p->{file} ||= sprintf "%s-%s-%s.%s.rpm", $p->{name}, $p->{version}, $p->{release}, c::headerGetEntry(getHeader($p), 'arch'); + print $p->{file}, "\n"; c::rpmtransAddPackage($trans, getHeader($p), $p->{file}, $p->{name} !~ /kernel/); #- TODO: replace `named kernel' by `provides kernel' # c::rpmtransAddPackage($trans, getHeader($p), $p->{file}, 1); #- TODO: replace `named kernel' by `provides kernel' $nb++; |