Skip to Content.
Sympa Menu

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

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 (42a27f9f7f9a7c037980fbc06e9109573c166a19)
  • Date: Sat, 3 Oct 2015 22:06:48 +0000

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libtablet | 17 ++++++++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)

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

tablet_create_version_cache: more verbosity for extreme cases like alter

commit 03bf1d299ba060471b834da38766a3b5e4b5361b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

tablet_create_version_cache: ignore more alter versions

diff --git a/ChangeLog b/ChangeLog
index de70c38..3f4b598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtablet: also ignore smgl-strip and prelink wrt version cache
+ * and print the problematic spells for easier use and debugging
+
2015-05-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libressurect: avoid conflict corner case #665

diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index c05fad0..2adbe72 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -760,22 +760,33 @@ function tablet_create_version_cache() {
elif [[ $spell == alter ]]; then
version=$(installed_version alter)
echo "$spell ${version:-0} ${patchlevel:-0} ${security_patch:-0}
${updated:-0}"
+ elif [[ $spell == smgl-prelink || $spell == smgl-strip ]]; then
+ version=$(installed_version $spell)
+ echo "$spell ${version:-0} ${patchlevel:-0} ${security_patch:-0}
${updated:-0}"
else
error_message "${PROBLEM_COLOR}Creation of the cache failed at
$spell," \
"please run cleanse --tablet and retry. If some spells" \
"have unfixable tablet pages, recast them.\n" \
"If you're ok with slower queueing of everything just
run:" \
"export OLD_QUEUING_METHOD=1 and you won't be bothered
again.$DEFAULT_COLOR"
+ rc=1
break
fi
- done | sort > $file
+ done > "$file"

- # we can't set rc inside the loop, since it is in a subshell and
- # the rc of break 13 still does not match what is documented in bash 4.2.24
if [[ ${#ok_spells[@]} != $(wc -l < $file) ]]; then
+ bad=$(tr ' ' '\n' <<< "${ok_spells[@]}" | sort - "$file" "$file" | uniq
-u)
+ if [[ $rc == 0 && -n $bad ]]; then
+ message "Spells with missing or corrupt tablet pages: $bad"
+ fi
rm $file
return 1
fi
+
+ # the rc of break 13 still does not match what is documented in bash 4.2.24
+ # (this is why we don't sort directly in the loop and have a separate rc
var)
+ sort "$file" > "$TMP_DIR}/sorting.$$.tmp"
+ mv "$TMP_DIR}/sorting.$$.tmp" "$file"
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (42a27f9f7f9a7c037980fbc06e9109573c166a19), Jaka Kranjc, 10/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page