From a4f2d67e980739d69148e2dbdb099c3bea7a594b Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 24 Feb 2005 18:02:37 +0000 Subject: do not update kde config file if kde isn't installed (spotted by Mathieu Geli) --- perl-install/network/network.pm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'perl-install') diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index cc6286f07..7e69b5b23 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -337,19 +337,22 @@ sub proxy_configure { chmod 0755, "$::prefix/etc/profile.d/proxy.csh"; #- KDE proxy settings - my $kde_config_file = "$::prefix/usr/share/config/kioslaverc"; - update_gnomekderc($kde_config_file, - undef, - PersistentProxyConnection => "false" - ); - update_gnomekderc($kde_config_file, - "Proxy Settings", - AuthMode => 0, - ProxyType => $u->{http_proxy} || $u->{ftp_proxy} ? 4 : 0, - ftpProxy => "ftp_proxy", - httpProxy => "http_proxy", - httpsProxy => "http_proxy" + my $kde_config_dir = "$::prefix/usr/share/config"; + my $kde_config_file = "$kde_config_dir/kioslaverc"; + if (-d $kde_config_dir) { + update_gnomekderc($kde_config_file, + undef, + PersistentProxyConnection => "false" + ); + update_gnomekderc($kde_config_file, + "Proxy Settings", + AuthMode => 0, + ProxyType => $u->{http_proxy} || $u->{ftp_proxy} ? 4 : 0, + ftpProxy => "ftp_proxy", + httpProxy => "http_proxy", + httpsProxy => "http_proxy" ); + } #- Gnome proxy settings if (-d "$::prefix/etc/gconf/2/") { -- cgit v1.2.1