diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-02-24 18:02:37 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-02-24 18:02:37 +0000 |
| commit | a4f2d67e980739d69148e2dbdb099c3bea7a594b (patch) | |
| tree | 345c290bccd719a6f294f9b422e31616df8c52da /perl-install/network/network.pm | |
| parent | 64c6baa6e5e7cebba3a88930d0a8085d34474c1a (diff) | |
| download | drakx-backup-do-not-use-a4f2d67e980739d69148e2dbdb099c3bea7a594b.tar drakx-backup-do-not-use-a4f2d67e980739d69148e2dbdb099c3bea7a594b.tar.gz drakx-backup-do-not-use-a4f2d67e980739d69148e2dbdb099c3bea7a594b.tar.bz2 drakx-backup-do-not-use-a4f2d67e980739d69148e2dbdb099c3bea7a594b.tar.xz drakx-backup-do-not-use-a4f2d67e980739d69148e2dbdb099c3bea7a594b.zip | |
do not update kde config file if kde isn't installed
(spotted by Mathieu Geli)
Diffstat (limited to 'perl-install/network/network.pm')
| -rw-r--r-- | perl-install/network/network.pm | 27 |
1 files changed, 15 insertions, 12 deletions
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/") { |