Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (c85fd00d740cf4f55d0790d1cfcc757529d971a7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (c85fd00d740cf4f55d0790d1cfcc757529d971a7)
  • Date: Thu, 21 Dec 2006 16:08:22 -0600

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 4 ++++
var/lib/sorcery/modules/libsorcery | 29 +++++++++++++----------------
2 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit c85fd00d740cf4f55d0790d1cfcc757529d971a7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

filter/filter_in removed tabs and debugging from previous commit (stupid
me)

diff --git a/ChangeLog b/ChangeLog
index 390c65a..3f29b8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-21 David Brown <dmlb2000 AT gmail.com>
+ * libsorcery: filter/filter_in removed debugging and tabs from
+ previous commit (stupid me)
+
2006-12-17 David Brown <dmlb2000 AT gmail.com>
* libsorcery: filter/filter_in removed /dev/null entry from both
functions

diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 7f56c0f..b37ddb4 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -510,17 +510,15 @@ function filter() {
echo -n "${thing/\!/}\|"
done)
RID_LIST=${RID_LIST%\\|}
- NOT_RID_LIST=${NOT_RID_LIST%\\|}
- echo "R:$RID_LIST" >&2
- echo "NR:$NOT_RID_LIST" >&2
+ NOT_RID_LIST=${NOT_RID_LIST%\\|}

local TMP_SSF=$(make_safe_dir)
local FILE=$TMP_SSF/ssf

- if [[ $RID_LIST ]]
- then
- if [[ $NOT_RID_LIST ]]
- then
+ if [[ $RID_LIST ]]
+ then
+ if [[ $NOT_RID_LIST ]]
+ then
cat > $FILE
{
grep -v "$NOT_RID_LIST\|$RID_LIST" $FILE
@@ -530,7 +528,7 @@ function filter() {
else
grep -v "$RID_LIST"
fi
- else
+ else
cat
fi
else
@@ -567,12 +565,11 @@ function filter_in() {
grep '^!' | while read thing; do
echo -n "${thing/\!/}\|"
done)
- RID_LIST=${RID_LIST%\\|}
- NOT_RID_LIST=${NOT_RID_LIST%\\|}
- echo "R:$RID_LIST" >&2
- echo "NR:$NOT_RID_LIST" >&2
- if [[ $RID_LIST ]]
- then
+ RID_LIST=${RID_LIST%\\|}
+ NOT_RID_LIST=${NOT_RID_LIST%\\|}
+
+ if [[ $RID_LIST ]]
+ then
if [[ $NOT_RID_LIST ]]
then
grep "$RID_LIST" |
@@ -580,8 +577,8 @@ function filter_in() {
else
grep "$RID_LIST"
fi
- else
- # grep '' outputs everything in this case we want nothing
+ else
+ # grep '' outputs everything in this case we want nothing
cat > /dev/null
fi
else



  • [SM-Commit] GIT changes to master sorcery by David Brown (c85fd00d740cf4f55d0790d1cfcc757529d971a7), David Brown, 12/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page