summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-10-22 16:36:39 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-10-22 16:36:39 +0000
commit311b1b008d0e4308266599b76c977246071d3242 (patch)
tree679b47e6bac8d7dd81978494384bd421c86679e3
parenta9d7b1ffaf3bb6af09971746f82c94b957321f55 (diff)
downloaddrakx-kbd-mouse-x11-311b1b008d0e4308266599b76c977246071d3242.tar
drakx-kbd-mouse-x11-311b1b008d0e4308266599b76c977246071d3242.tar.gz
drakx-kbd-mouse-x11-311b1b008d0e4308266599b76c977246071d3242.tar.bz2
drakx-kbd-mouse-x11-311b1b008d0e4308266599b76c977246071d3242.tar.xz
drakx-kbd-mouse-x11-311b1b008d0e4308266599b76c977246071d3242.zip
bail out earlier if X isn't installed
-rw-r--r--lib/mouse.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 4167df7..6f40017 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -374,6 +374,8 @@ sub set_xfree_conf {
sub various_xfree_conf {
my ($do_pkgs, $mouse) = @_;
+ -e "/usr/bin/X" or return;
+
#- we don't need this anymore. Remove it for upgrades
unlink("$::prefix/etc/X11/xinit.d/mouse_buttons");
{
@@ -385,9 +387,6 @@ sub various_xfree_conf {
}
}
- if (! -e "/usr/bin/X") {
- return;
- }
my $inputdrvpath = Xconfig::card::modules_dir() . '/input';
my $pkgs = [
if_($mouse->{synaptics}, ['x11-driver-input-synaptics', "$inputdrvpath/synaptics_drv.so"]),