summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/mouse.pm4
-rw-r--r--perl-install/pkgs.pm12
2 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index b7853eb68..d884f8db5 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -113,10 +113,6 @@ sub detect() {
eval { commands::modprobe("serial") };
my ($r, $wacom) = mouseconfig(); return ($r, $wacom) if $r;
- #- my %l;
- #- eval { commands::modprobe("serial") };
- #- @l{qw(FULLNAME nbuttons MOUSETYPE XMOUSETYPE device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) and return \%l;
- #- modules::unload("serial");
require pci_probing::main;
if (my ($c) = pci_probing::main::probe("serial_usb")) {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4285ec229..a905b9284 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -396,6 +396,12 @@ sub selectPackagesToUpgrade($$$;$$) {
local $_; #- else perl complains on the map { ... } grep { ... } @...;
my %installedFilesForUpgrade; #- help searching package to upgrade in regard to already installed files.
+ #- used for package that are not correctly updated.
+ my %upgradeNeedRemove = (
+ 'compat-glibc' => 1,
+ 'compat-libs' => 1,
+ );
+
#- help removing package which may have different release numbering
my %toRemove; map { $toRemove{$_} = 1 } @{$toRemove || []};
@@ -423,6 +429,12 @@ sub selectPackagesToUpgrade($$$;$$) {
} else {
$p->{installed} = 1;
}
+ } elsif ($upgradeNeedRemove{$p->{name}}) {
+ my $otherPackage = (c::headerGetEntry($header, 'name'). '-' .
+ c::headerGetEntry($header, 'version'). '-' .
+ c::headerGetEntry($header, 'release'));
+ log::l("removing $otherPackage since it will not upgrade correctly!");
+ $toRemove{$otherPackage} = 1; #- force removing for theses other packages, select our.
}
} else {
my @files = c::headerGetEntry($header, 'filenames');