Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-sobukus-protection sorcery by Thomas Orgis (e84a9924aaf866e58c17c0308927e2649afbd3ff)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-sobukus-protection sorcery by Thomas Orgis (e84a9924aaf866e58c17c0308927e2649afbd3ff)
  • Date: Mon, 7 Sep 2020 12:30:26 +0000

GIT changes to devel-sobukus-protection sorcery by Thomas Orgis
<sobukus AT sourcemage.org>:

var/lib/sorcery/modules/libcodex | 1 +
var/lib/sorcery/modules/libmisc | 1 +
var/lib/sorcery/modules/libsorcery | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e84a9924aaf866e58c17c0308927e2649afbd3ff
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libsorcery: fix updating of sorcery again by actuall decompressing the
tarball

`bzip -dc` decompresses,
`bzip -c` does not.
We got broken `sorcery -u` for a year.
Celebrate!

commit 79fa495cbacaa8aeb1af46cbedf65ffcbc135d6c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

Add FIXMEs for compgen

diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index 5bf07fd..5b4f9e5 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -625,6 +625,7 @@ codex_clear_current_spell() {
VERSION SHORT UPDATED WEB_SITE ENTERED MAINTAINER \
MD5 LICENSE BUILD_API SECURITY_PATCH PATCHLEVEL \
$(compgen -v SOURCE|grep -E '^SOURCE[0-9]*(_URL)?$')
+ # FIXME compgen depends on bash containing readline support
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index fdfa2f7..2157ecc 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1205,6 +1205,7 @@ real_get_safe_locale() {
#---------------------------------------------------------------------
real_get_source_nums() {
local foo
+ # FIXME compgen depends on bash containing readline support
compgen -v SOURCE |
grep '^SOURCE[0-9]*$'|sort -u|
while read foo; do echo "${1}${foo/SOURCE/}"; done
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 06233ee..f68d680 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -76,7 +76,7 @@ update_sorcery_scripts() {
mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY
# untar is defined by libunpack
- bzip2 -c < "$FILENAME" | untar &&
+ bzip2 -dc < "$FILENAME" | untar &&
cd $SOURCE_DIRECTORY &&

pwd || return 1



  • [SM-Commit] GIT changes to devel-sobukus-protection sorcery by Thomas Orgis (e84a9924aaf866e58c17c0308927e2649afbd3ff), Thomas Orgis, 09/07/2020

Archive powered by MHonArc 2.6.24.

Top of Page