New commits:
commit eae5266f71178b582f57948510af75bd20c6cc93
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libresurrect: also restore the sub_depends info, mentioned in #13904
diff --git a/ChangeLog b/ChangeLog
index b790a1e..c492505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* dispel.8: added --total-dispel and fixed some grammar
* libgrimoire: fixed private_installed_version to match regex chars
too
* dispel: fixed bug #13904 - downgrading was incomplete, use ressurect
+ * libresurrect: also restore the sub_depends info, mentioned in #13904
2008-01-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstate: moved the subshell from the callers into
query_spell_status and
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 72d6212..d1396ef 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -575,13 +575,21 @@ function resurrect_success() {
# none of the old values are valid, only the new, uncommitted values are
remove_depends_status $DEPENDS_STATUS $SPELL
local spell_depends=$OLD_TABLET_DIR/depends
- local t_DEPENDS_STATUS
+ local t_DEPENDS_STATUS t_SUB_DEPENDS_STATUS
lock_start_transaction "$DEPENDS_STATUS" t_DEPENDS_STATUS
if [ -e $spell_depends ] ; then
cat $spell_depends >> $t_DEPENDS_STATUS
fi
lock_commit_transaction $DEPENDS_STATUS
+ remove_sub_depends $SUB_DEPENDS_STATUS $SPELL
+ local spell_sub_depends=$OLD_TABLET_DIR/sub_depends
+ if [[ -e $spell_sub_depends ]]; then
+ lock_start_transaction "$SUB_DEPENDS_STATUS" t_SUB_DEPENDS_STATUS
+ cat $spell_sub_depends >> $t_SUB_DEPENDS_STATUS
+ lock_commit_transaction $SUB_DEPENDS_STATUS
+ fi
+
# if theres a tablet dir, store it with a new timestamp
if new_tablet=$(tablet_get_path $SPELL) ; then
cp -Rp $OLD_TABLET_DIR/* $new_tablet
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (eae5266f71178b582f57948510af75bd20c6cc93),
Jaka Kranjc, 01/23/2008