summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-14 07:14:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-14 07:14:30 +0000
commitfbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5 (patch)
treefc4e5e9c0d2bec965198cff55acb3a76fffe9af6
parent2f823303f8636993677225ff9f306f3bc3066799 (diff)
downloaddrakx-fbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5.tar
drakx-fbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5.tar.gz
drakx-fbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5.tar.bz2
drakx-fbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5.tar.xz
drakx-fbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5.zip
simplify
-rw-r--r--perl-install/services.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 581f5fc92..e3d799bf9 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -99,11 +99,10 @@ xfs => N_("Starts the X Font Server (this is mandatory for Xorg to run)."),
$s ||= -e "$::prefix/etc/init.d/$name" && cat_("$::prefix/etc/init.d/$name");
$s ||= -e "$::prefix/etc/xinetd.d/$name" && cat_("$::prefix/etc/xinetd.d/$name");
$s =~ s/\\\s*\n#\s*//mg;
- if ($s =~ /^# description:\s+\S/sm) {
- ($s) = $s =~ /^# description:\s+(.*?)^(?:[^#]|# {0,2}\S)/sm;
- } else {
- ($s) = $s =~ /^#\s*(.*?)^[^#]/sm;
- }
+ $s =
+ $s =~ /^# description:\s+(.*?)^(?:[^#]|# {0,2}\S)/sm ? $1 :
+ $s =~ /^#\s*(.*?)^[^#]/sm ? $1 : '';
+
$s =~ s/#\s*//mg;
}
$s =~ s/\n/ /gm; $s =~ s/\s+$//;