Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-1.15 sorcery by Jaka Kranjc (ed47d3905d8e7fa7f7c7b5055873107a90a2d942)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-1.15 sorcery by Jaka Kranjc (ed47d3905d8e7fa7f7c7b5055873107a90a2d942)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-1.15 sorcery by Jaka Kranjc (ed47d3905d8e7fa7f7c7b5055873107a90a2d942)
  • Date: Mon, 27 Aug 2012 10:56:50 -0500
GIT changes to stable-1.15 sorcery by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

ChangeLog | 23 +++++++++++++++++++++++
etc/sorcery/version | 2 +-
usr/sbin/sorcery | 2 +-
var/lib/sorcery/modules/dl_handlers/dl_svn | 8 ++++++++
var/lib/sorcery/modules/libcodex | 3 ++-
var/lib/sorcery/modules/libmisc | 2 +-
var/lib/sorcery/modules/libresurrect | 2 +-
var/lib/sorcery/modules/libsummon | 5 ++++-
var/lib/sorcery/modules/libtablet | 16 +++++++++++-----
var/lib/sorcery/modules/libunpack | 4 ++--
10 files changed, 54 insertions(+), 13 deletions(-)

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

1.15.2

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

1.15.2

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

sorcery: only look at spec files when scanning architectures, fixes #438

grep 2.11 changelog:
grep no longer silently suppresses errors when reading a directory
as if it were a text file. For example, "grep x ." now reports a
read error on most systems; formerly, it ignored the error.
[bug introduced in grep-2.5]

this exposed a bug, since we were doing exactly that without suppression

commit 9878badac1391df4f1126704af5c4ecd9908d5fe
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtablet: added third option to the broken version cache warning

fixes #378

Conflicts:
ChangeLog

commit 058dd796b561949ca8ac0b5bbd2b18d883367d39
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libunpack, libmisc: also detect old style xz archives #347

fixes #347

commit 388ba256a47a707ccd8dae23eecda36afeb1c33a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.15.2-rc1

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

libsummon: check also the sanity of signatures in source_sanity #342

commit 25589ac9245b9bc42d8f0f402e8a0cc9dcaa7c59
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtablet: fixed error checking in tablet_check_version_cache #378

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

dl_svn: do a repo upgrade if necessary #336

commit d1d81f9a1adf8c5cbdd23aafea4cf30ab1909f59
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libcodex: wrap long description to the width of the terminal

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

libressurect: clarified a merge message
based on c664ae494729b8

diff --git a/ChangeLog b/ChangeLog
index 90027d8..824da94 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,29 @@
+2012-08-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * version: 1.15.2 released!
+
2012-01-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* version: 1.15.1 released!

+2012-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sorcery: only look at spec files when scanning architectures #438
+
+2012-06-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtablet: added third option to the broken version cache warning
+
+2012-06-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libunpack, libmisc: also detect old style xz archives #347
+
+2012-04-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * dl_svn: do a repo upgrade if necessary #336
+ * libtablet: fixed error checking in tablet_check_version_cache #378
+ * libsummon: check also the sanity of signatures in source_sanity #342
+
+2011-10-17 Bor Kraljič <pyrobor AT ver.si>
+ * libcodex: wrap long description to the width of the terminal
+
+2011-10-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libressurect: clarified a merge message
+
2011-10-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdownload: print the original argument if cmd is unset

diff --git a/etc/sorcery/version b/etc/sorcery/version
index ace4423..42cf067 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.15.1
+1.15.2
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 4b4f30d..75b8f09 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -685,7 +685,7 @@ architecture_menu() {
# same name), it reverses the output from tac so that the first archspecs
# found are the last added to the hash table and thus are prefered over
# ones found later
- for SPECFILE in $(find $ARCH_SPECS -not -name '*~'|tac); do
+ for SPECFILE in $(find $ARCH_SPECS -type f -not -name '*~' | tac); do
if test -x "$SPECFILE" && grep -q "CPUNAME" $SPECFILE; then
smgl_basename "$SPECFILE" specname
hash_put archspec_hash $specname $SPECFILE
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index 4f6471c..818bf0e 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -50,6 +50,14 @@ function dl_svn_get () {
svn_args="$svn_args --trust-server-cert"
fi

+ local svn_format=$(head -1 $target/.svn/entries)
+ message "${MESSAGE_COLOR}Subversion working copy format:
$svn_format${DEFAULT_COLOR}"
+ if (( ${svn_format:-100} <= 10 )); then
+ message "${MESSAGE_COLOR}Running svn upgrade...${DEFAULT_COLOR}"
+ echo svn upgrade $svn_args $target
+ svn upgrade $svn_args $target
+ fi
+
if test -d $target; then
message "${MESSAGE_COLOR}Running svn update...${DEFAULT_COLOR}"
echo svn update $svn_args -r $SVN_TAG $target
diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index b3e9c05..176225a 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -1028,7 +1028,8 @@ function codex_find_spell_or_section_by_name() {
##
#---------------------------------------------------------------------
function codex_get_spell_description() {
- codex_is_directory_a_spell "$1" && . "$1/DETAILS"
+ local width=$(stty size | cut -d' ' -f2)
+ codex_is_directory_a_spell "$1" && . "$1/DETAILS" | fmt -w $width -s
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 55a56db..dbafef0 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1627,7 +1627,7 @@ function show_file() {
fi ;;
bzip2*) bzcat "$file" | $PAGER ;;
gzip*) gzip -cd "$file" | $PAGER ;;
- XZ*|LZMA*) xz -cd "$file" | $PAGER ;;
+ xz*|XZ*|LZMA*) xz -cd "$file" | $PAGER ;;
7-zip*) 7z -d "$file" | $PAGER ;;
*) message "Unknown file type."
return 1 ;;
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 7daae48..931ec62 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -532,7 +532,7 @@ function real_handle_changed_config() {
message "(0) trash $to and install over it"
message "(1) backup $to to $to.$savetime.old, install the new file in
its place"
message "(2) leave $to in its place, copy the new file to
$to.$savetime.new"
- message "(3) do nothing"
+ message "(3) do nothing - leave $to in its place, discard new file"
message "(4) see a diff between $to and the new file"
# TODO: someday add an option to use an external merge tool

diff --git a/var/lib/sorcery/modules/libsummon
b/var/lib/sorcery/modules/libsummon
index 3de9d2b..49fba3c 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -457,7 +457,10 @@ function source_sanity() {
[[ "$1" != "${1%.tar.?}" ]] ||
[[ "$1" != "${1%.tar}" ]] ||
[[ "$1" != "${1%.zip}" ]] ||
- [[ "$1" != "${1%.tgz}" ]]; then
+ [[ "$1" != "${1%.tgz}" ]] ||
+ [[ "$1" != "${1%.sig}" ]] ||
+ [[ "$1" != "${1%.sign}" ]] ||
+ [[ "$1" != "${1%.asc}" ]]; then
local _type=$(file -bi "$1")
if echo $_type | grep -iq "text/"; then
message "$core_msg $_type"
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 4cdbe60..9950187 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -747,8 +747,9 @@ function tablet_create_version_cache() {
local page_dir
local spell version patchlevel security_patch updated
local rc=0
+ local ok_spells=( $(get_all_spells_with_status ok) )

- for spell in $(get_all_spells_with_status ok); do
+ for spell in ${ok_spells[@]}; do
if tablet_find_spell_dir $spell page_dir; then
tablet_get_version $page_dir version
tablet_get_patchlevel $page_dir patchlevel
@@ -761,14 +762,19 @@ function tablet_create_version_cache() {
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.$DEFAULT_COLOR"
- rc=1
+ "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"
break
fi
done | sort > $file

- [[ $rc == 1 ]] && rm $file
- return $rc
+ # 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
+ rm $file
+ return 1
+ fi
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index 0b883a6..773bd54 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -204,7 +204,7 @@ function uncompress_core() {
Zip) cat "$1" ;;
RPM) rpmunpack < "$1" | gzip -cd ;;
tar) cat "$1" ;;
- XZ) xz -cdf "$1" ;;
+ xz|XZ) xz -cdf "$1" ;;
LZMA) xz -cdf "$1" ;;
7-zip) cat "$1" ;; # 7z supports stdout, but it unpacks at the
same time
*) cat "$1" ;;
@@ -227,7 +227,7 @@ function unpack_core() {
debug "libgrimoire" "unpack_core - $*"

case "$2" in
- bzip2|gzip|compress*|tar|XZ|LZMA)
+ bzip2|gzip|compress*|tar|XZ|xz|LZMA)
if real_list_find "$3" same-permissions; then
tar -xf /dev/stdin 2> /dev/null
else


Archive powered by MHonArc 2.6.24.

Top of Page