[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeadmin/knetworkconf/backends
From: Than Ngo <than () redhat ! de>
Date: 2009-07-27 10:11:00
Message-ID: 1248689460.013586.21220.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1002920 by thanngo:
fix knetworkconf backend to recognize fedora network settings
M +1 -1 network-conf.cmake
M +7 -21 network.pl.cmake
M +2 -17 platform.pl.cmake
M +4 -12 service.pl.cmake
--- trunk/KDE/kdeadmin/knetworkconf/backends/network-conf.cmake #1002919:1002920
@@ -71,7 +71,7 @@
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", \
"debian-testing",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", \
"ubuntu-7.10", "ubuntu-8.04", "suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "specifix", \
"yoper-2.1", "yoper-2.2", + "turbolinux-7.0", "fedora", "specifix", \
"yoper-2.1", "yoper-2.2", "pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1", \
"mandriva-2008.0", "mandriva-2008.1",
--- trunk/KDE/kdeadmin/knetworkconf/backends/network.pl.cmake #1002919:1002920
@@ -528,9 +528,7 @@
"pld-1.99" => "redhat-6.2",
"conectiva-9" => "debian-2.2",
"conectiva-10" => "debian-2.2",
- "fedora-1" => "redhat-6.2",
- "fedora-2" => "redhat-6.2",
- "fedora-3" => "redhat-6.2",
+ "fedora" => "redhat-6.2",
"yoper-2.1" => "redhat-6.2",
"yoper-2.2" => "redhat-6.2",
"specifix" => "redhat-6.2",
@@ -1832,9 +1830,7 @@
"pld-1.0" => \&gst_network_pld10_get_file,
"pld-1.1" => \&gst_network_pld10_get_file,
"pld-1.99" => \&gst_network_pld10_get_file,
- "fedora-1" => \&gst_network_rh72_get_file,
- "fedora-2" => \&gst_network_rh72_get_file,
- "fedora-3" => \&gst_network_rh72_get_file,
+ "fedora" => \&gst_network_rh72_get_file,
"yoper-2.1" => \&gst_network_rh72_get_file,
"yoper-2.2" => \&gst_network_rh72_get_file,
"specifix" => \&gst_network_rh72_get_file,
@@ -3956,9 +3952,7 @@
"pld-1.0" => "lo",
"pld-1.1" => "lo",
"pld-1.99" => "lo",
- "fedora-1" => "",
- "fedora-2" => "",
- "fedora-3" => "",
+ "fedora" => "",
"yoper-2.1" => "",
"yoper-2.2" => "",
"specifix" => "",
@@ -4106,9 +4100,7 @@
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
@@ -4607,9 +4599,7 @@
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
@@ -5503,9 +5493,7 @@
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
@@ -5954,9 +5942,7 @@
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
--- trunk/KDE/kdeadmin/knetworkconf/backends/platform.pl.cmake #1002919:1002920
@@ -104,9 +104,7 @@
"pld-1.99" => "PLD 1.99 Ac-pre",
"vine-3.0" => "Vine Linux 3.0",
"vine-3.1" => "Vine Linux 3.1",
- "fedora-1" => "Fedora Core 1 (Yarrow)",
- "fedora-2" => "Fedora Core 2 (Tettnang)",
- "fedora-3" => "Fedora Core 3 (Heidelberg)",
+ "fedora" => "Fedora",
"yoper-2.1" => "Yoper Linux 2.1 (for i686)",
"yoper-2.2" => "Yoper Linux 2.2 (for i686)",
"specifix" => "Specifix Linux",
@@ -296,20 +294,7 @@
sub check_fedora
{
- open FEDORA, "$gst_prefix/etc/fedora-release" or return -1;
- while (<FEDORA>)
- {
- $ver = $_;
- chomp ($ver);
-
- if ($ver =~ /^Fedora Core release (\S+)/)
- {
- close FEDORA;
- return "fedora-$1";
- }
- }
-
- close FEDORA;
+ return "fedora" if stat ("$gst_prefix/etc/fedora-release");
return -1;
}
--- trunk/KDE/kdeadmin/knetworkconf/backends/service.pl.cmake #1002919:1002920
@@ -107,9 +107,7 @@
"pld-1.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"],
"pld-1.99" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"],
- "fedora-1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"],
- "fedora-2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"],
- "fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"], + "fedora" => ["$gst_prefix/etc/rc.d", \
"$gst_prefix/etc/rc.d/init.d", "../init.d"],
"yoper-2.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"],
"yoper-2.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"], @@ -192,9 +190,7 @@
"pld-1.1" => [3, 5],
"pld-1.99" => [3, 5],
- "fedora-1" => [3, 5],
- "fedora-2" => [3, 5],
- "fedora-3" => [3, 5],
+ "fedora" => [3, 5],
"yoper-2.1" => [3, 5],
"yoper-2.2" => [3, 5],
@@ -272,9 +268,7 @@
"pld-1.0" => "redhat-5.2",
"pld-1.1" => "redhat-5.2",
"pld-1.99" => "redhat-5.2",
- "fedora-1" => "redhat-5.2",
- "fedora-2" => "redhat-5.2",
- "fedora-3" => "redhat-5.2",
+ "fedora" => "redhat-5.2",
"yoper-2.1" => "redhat-5.2",
"yoper-2.2" => "redhat-5.2",
@@ -1635,9 +1629,7 @@
"redhat-8.0" => \&gst_service_redhat_get_status,
"redhat-9" => \&gst_service_redhat_get_status,
"mandrake-7.2" => \&gst_service_redhat_get_status,
- "fedora-1" => \&gst_service_redhat_get_status,
- "fedora-2" => \&gst_service_redhat_get_status,
- "fedora-3" => \&gst_service_redhat_get_status,
+ "fedora" => \&gst_service_redhat_get_status,
"yoper-2.1" => \&gst_service_redhat_get_status,
"yoper-2.2" => \&gst_service_redhat_get_status,
"specifix" => \&gst_service_redhat_get_status,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic