summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-02-28 13:11:13 +0000
committerFrancois Pons <fpons@mandriva.com>2002-02-28 13:11:13 +0000
commitaaa3994dcae3cd7733aa10a0bb28c1d25ca4af50 (patch)
treed49afbc5c250e7bafad2dd36b42ec40f7bee5098
parent7b5d06903b6348b4e130a6ec2034e5d4a0c94819 (diff)
downloaddrakx-aaa3994dcae3cd7733aa10a0bb28c1d25ca4af50.tar
drakx-aaa3994dcae3cd7733aa10a0bb28c1d25ca4af50.tar.gz
drakx-aaa3994dcae3cd7733aa10a0bb28c1d25ca4af50.tar.bz2
drakx-aaa3994dcae3cd7733aa10a0bb28c1d25ca4af50.tar.xz
drakx-aaa3994dcae3cd7733aa10a0bb28c1d25ca4af50.zip
fixed bad copy of INSTALL packages.
-rwxr-xr-xtools/oem-prepare21
1 files changed, 14 insertions, 7 deletions
diff --git a/tools/oem-prepare b/tools/oem-prepare
index d1c7d521c..05c26abf5 100755
--- a/tools/oem-prepare
+++ b/tools/oem-prepare
@@ -64,6 +64,8 @@ foreach my $medium (@media) {
if ($mode eq 'clean') {
#- copy and install from each cd image.
foreach my $medium (@media) {
+ print "Examining packages from medium labeled \"$medium->{descr}\"\n";
+
foreach my $pkg (@{$packages->{depslist}}) {
$pkg->{closure} && !$pkg->{selected} or next;
my $file = "$dir/$medium->{rpmsdir}/" . rpm_filename($pkg);
@@ -74,7 +76,6 @@ if ($mode eq 'clean') {
}
}
- print "Installing packages from medium labeled \"$medium->{descr}\"\n";
if (my $pkg = pkgs::packageByName($packages, 'glibc')) { #- HACK FOR GLIBC
if (delete $pkg->{selected}) {
delete $rpms{rpm_filename($pkg)} or next;
@@ -125,8 +126,8 @@ sub select_packages {
#- INSTALL class need to be copied as closure (unless installed after).
foreach (@{$o->{packages}{needToCopy}}) {
- my $pkg = pkgs::packageByName($packages, $_);
- pkgs::selectPackage($packages, $pkg);
+ my $pkg = pkgs::packageByName($o->{packages}, $_);
+ pkgs::selectPackage($o->{packages}, $pkg);
}
#- first select package that have to go to closure according to their names.
@@ -424,7 +425,7 @@ sub readCompssUsers {
}
sub setSelectedFromCompssList {
- my ($packages, $compssUsersChoice, $min_level, $max_size) = @_;
+ my ($packages, $compssUsersChoice, $min_level, $max_size, $otherOnly) = @_;
$compssUsersChoice->{TRUE} = 1; #- ensure TRUE is set
my $nb = selectedSize($packages);
foreach my $p (sort { packageRate($b) <=> packageRate($a) } values %{$packages->{names}}) {
@@ -450,9 +451,15 @@ sub setSelectedFromCompssList {
}
#- at this point the package can safely be selected.
- selectPackage($packages, $p);
+ if ($otherOnly) {
+ selectPackage($packages, $p, 0, $otherOnly);
+ } else {
+ selectPackage($packages, $p);
+ }
+ }
+ unless ($otherOnly) {
+ log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
+ log::l("setSelectedFromCompssList: ", join(" ", sort map { packageName($_) } grep { packageFlagSelected($_) } @{$packages->{depslist}}));
}
- log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
- log::l("setSelectedFromCompssList: ", join(" ", sort map { packageName($_) } grep { packageFlagSelected($_) } @{$packages->{depslist}}));
$min_level;
}