[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (6e00554e27df831110ae3834ac86f98594f26ce2)
Jaka Kranjc
scm at sourcemage.org
Thu Aug 28 15:10:37 EDT 2008
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:
var/lib/sorcery/modules/libdepends | 39 -------------------------------------
1 files changed, 39 deletions(-)
New commits:
commit 6e00554e27df831110ae3834ac86f98594f26ce2
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Revert "WIP: cleaner failure handling"
it's a wip ...
This reverts commit f40d4fed86a65a742b86a39d661d7ab34851604c.
diff --git a/var/lib/sorcery/modules/libdepends b/var/lib/sorcery/modules/libdepends
index ee11d57..21f0d72 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1688,53 +1688,14 @@ function private_discard_spell()
local bonus=${BONUS_SPELLS[@]}
local up_depends=${UP_DEPENDS[@]}
- local runtime_depends=${RUNTIME_DEPENDS[@]}
- local new_runtime_depends=${NEW_RUNTIME_DEPENDS[@]}
- local spells2=${spells[@]}
- local triggerees2=${TRIGGEREES[@]}
- local triggerees3=${triggerees[@]}
- local new_depends=${NEW_DEPENDS[@]}
if real_list_find "$bonus" $spell; then
-echo +b+$bonus+$spell
real_list_remove bonus $spell
BONUS_SPELLS=( $bonus )
fi
if real_list_find "$up_depends" $spell; then
-echo +u+$up_depends+$spell
real_list_remove up_depends $spell
UP_DEPENDS=( $up_depends )
fi
- if real_list_find "$runtime_depends" $spell; then
-echo +r+$runtime_depends+$spell
- real_list_remove runtime_depends $spell
- RUNTIME_DEPENDS=( $runtime_depends )
- fi
- if real_list_find "$spells2" $spell; then
-echo +s+$spells2+$spell
- real_list_remove spells2 $spell
- spells=( $spells2 )
- fi
- if real_list_find "$new_runtime_depends" $spell; then
-echo +nr+$new_runtime_depends+$spell
- real_list_remove new_runtime_depends $spell
- NEW_RUNTIME_DEPENDS=( $new_runtime_depends )
- fi
- if real_list_find "$triggerees2" $spell; then
-echo +t+$triggerees2+$spell
- real_list_remove triggerees2 $spell
- TRIGGEREES=( $triggerees2 )
- fi
- if real_list_find "$triggerees3" $spell; then
-echo +t2+$triggerees3+$spell
- real_list_remove triggerees3 $spell
- triggerees=( $triggerees3 )
- fi
- if real_list_find "$new_depends" $spell; then
-echo +nd+$new_depends+$spell
- real_list_remove new_depends $spell
- NEW_DEPENDS=( $new_depends )
- fi
- #FORCE_DEPENDS, NEW_* ...
}
#---------------------------------------------------------------------
More information about the SM-Commit
mailing list