Skip to Content.
Sympa Menu

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

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 (3f2e307fdbfeb894dde2966be58f34b2bdfa37f0)
  • Date: Mon, 28 Apr 2008 10:05:57 -0500

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libgpg | 2 +-
var/lib/sorcery/modules/libresurrect | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)

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

* libresurrect: fixed ordering of the version cache addition
* libgpg: fixed case in an error message

diff --git a/ChangeLog b/ChangeLog
index c45f35d..518e9c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libresurrect: fixed ordering of the version cache addition
+ * libgpg: fixed case in an error message
+
2008-04-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcast: made the optional dependency on xinetd suggested and
changed two
comments
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 5a7877c..23825df 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -267,7 +267,7 @@ function gpg_verify_common() {
url_download "$SIG_FILE" "$SIG_URL" "file" gpg_target gpg_type &&
[[ $gpg_type == file ]] ||
{
- message "Failed to get gpg signature! verification is impossible!"
+ message "Failed to get gpg signature! Verification is impossible!"
return 255
}
[[ "$gpg_target" != $SIG_FILE ]] && mv "$gpg_target" "$SIG_FILE"
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 23c7249..c4a820f 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -609,9 +609,6 @@ function resurrect_success() {
create_md5list $TMP_INSTALL_LOG /dev/stdout |
log_adjuster /dev/stdin $MD5_LOG root log md5_log_filter

- # add packages line
- add_spell "$SPELL" "installed" "$VERSION"
-
tablet_check_version_cache "$VERSION_STATUS" &&
(
if tablet_find_spell_dir $SPELL page_dir && [[ $new_tablet ]]; then
@@ -628,6 +625,9 @@ function resurrect_success() {
add_version_cache "$VERSION_STATUS" "$SPELL" "$VERSION" "$PATCHLEVEL"
"$SECURITY_PATCH" "$UPDATED"
)

+ # add packages line
+ add_spell "$SPELL" "installed" "$VERSION"
+
pop_install_queue "$SPELL"
echo $SPELL >> $SUCCESS_LIST




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (3f2e307fdbfeb894dde2966be58f34b2bdfa37f0), Jaka Kranjc, 04/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page