Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1b5578de0d6689d5aad43b68fb5dbe453da3d3b3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1b5578de0d6689d5aad43b68fb5dbe453da3d3b3)
  • Date: Wed, 22 Sep 2010 10:57:24 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
var/lib/sorcery/modules/libinitd | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 1b5578de0d6689d5aad43b68fb5dbe453da3d3b3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libinitd: fixed bad regexes, grep 2.7 does not tolerate them #15852

diff --git a/ChangeLog b/ChangeLog
index 4332f6d..6684d19 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-09-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libinitd: fixed bad regexes, grep 2.7 does not tolerate them #15852
+
2010-08-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstage: fixed regression from 070be194c9e

diff --git a/var/lib/sorcery/modules/libinitd
b/var/lib/sorcery/modules/libinitd
index ca71720..cdb55ac 100755
--- a/var/lib/sorcery/modules/libinitd
+++ b/var/lib/sorcery/modules/libinitd
@@ -176,7 +176,7 @@ function init_prepare_install()
local old_provides="$2"
local result_list="$3"
local script_path="$SCRIPT_DIRECTORY/init.d/$service"
- local script_provides=$( grep '^[:space:]*PROVIDES' $script_path )
+ local script_provides=$( grep '^[[:space:]]*PROVIDES' $script_path )
script_provides=$( eval "( ${script_provides:=:} ; echo \$PROVIDES ; )" )

[ -z "$script_provides" ] && return
@@ -208,7 +208,7 @@ function init_install()
local enable_script="$1"
local script_name="$2"
local script_path="$SCRIPT_DIRECTORY/init.d/$script_name"
- local script_runlevel=$( grep '^[:space:]*RUNLEVEL' $script_path )
+ local script_runlevel=$( grep '^[[:space:]]*RUNLEVEL' $script_path )
script_runlevel=$( eval "( $script_runlevel ; echo \$RUNLEVEL )" )

[ "$script_runlevel" = "s" ] && script_runlevel="S"
@@ -265,7 +265,7 @@ function init_post_install()
mark_file_modified "$INSTALL_ROOT/etc/sysconfig/facilities"
IFS=":"
set $sp # $1 - script name, $2 - facility
- if ! sedit "s/^\([:space:]*$2\)=.*/\1=$1/" \
+ if ! sedit "s/^\([[:space:]]*$2\)=.*/\1=$1/" \
$INSTALL_ROOT/etc/sysconfig/facilities ; then
message -n "${PROBLEM_COLOR}Unable to modify facilities file to make
"
message "$1 provider of $2.${DEFAULT_COLOR}"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1b5578de0d6689d5aad43b68fb5dbe453da3d3b3), Jaka Kranjc, 09/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page