Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a59cbca7006390cf5740076619ef1b5054713ed5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a59cbca7006390cf5740076619ef1b5054713ed5)
  • Date: Fri, 19 Jan 2007 10:50:47 -0600

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

utils/sudo/BUILD | 8 +++++---
utils/sudo/DEPENDS | 2 +-
utils/sudo/HISTORY | 5 +++++
utils/sudo/TRIGGERS | 9 ++++-----
4 files changed, 15 insertions(+), 9 deletions(-)

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

sudo: sanitize TRIGGERS

commit 3b840ea1ea9834cbeb06b3862fbf63c2a7177e39
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

sudo: fix #13423

diff --git a/utils/sudo/BUILD b/utils/sudo/BUILD
index 4ca46f3..45a2723 100755
--- a/utils/sudo/BUILD
+++ b/utils/sudo/BUILD
@@ -1,4 +1,6 @@
-EDITOR=`which ${EDITOR%% *} 2>/dev/null` ||
-EDITOR=`which nano` &&
-OPTS="$OPTS --with-editor=$EDITOR" &&
+local editor=$(get_spell_provider sudo TEXT-EDITOR) &&
+hash $editor &&
+editor=$(hash -t $editor) &&
+
+OPTS="$OPTS --with-editor=$editor" &&
default_build
diff --git a/utils/sudo/DEPENDS b/utils/sudo/DEPENDS
index 2b04760..5f9eccd 100755
--- a/utils/sudo/DEPENDS
+++ b/utils/sudo/DEPENDS
@@ -1,4 +1,4 @@
-depends which &&
+depends TEXT-EDITOR &&

optional_depends linux-pam \
'--with-pam' \
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 9447d0d..75d22f5 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,8 @@
+2007-01-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * TRIGGERS: sanitize
+ * BUILD: pass the provider of TEXT-EDITOR #13423
+ * DEPENDS: removed which and added TEXT-EDITOR for #13423
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/sudo/TRIGGERS b/utils/sudo/TRIGGERS
index c8d3360..7c87645 100755
--- a/utils/sudo/TRIGGERS
+++ b/utils/sudo/TRIGGERS
@@ -1,5 +1,4 @@
-for i in $(grep $SPELL $DEPENDS_STATUS);
-do if [ $(echo $i | cut -d: -f1) = "$SPELL" ] && [ $(echo $i | cut -d: -f2)
== "linux-pam" ] && [ $(echo $i | cut -d: -f3 ) = "on" ] ;
- then on_cast linux-pam cast_self
- fi
-done
+. $GRIMOIRE/is_depends_enabled.function &&
+if is_depends_enabled $SPELL linux-pam; then
+ on_cast linux-pam cast_self
+fi



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a59cbca7006390cf5740076619ef1b5054713ed5), Jaka Kranjc, 01/19/2007

Archive powered by MHonArc 2.6.24.

Top of Page