Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (d24861b6b5d451c229e95d5950d0c328abe5a1d8)

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 test-1.14 sorcery by Jaka Kranjc (d24861b6b5d451c229e95d5950d0c328abe5a1d8)
  • Date: Thu, 2 Oct 2008 13:59:37 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 23 ++++++++++++++++++++++-
etc/sorcery/version | 2 +-
usr/sbin/cast | 18 ++++++++++--------
usr/share/man/man8/cast.8 | 13 +++++++++++--
var/lib/sorcery/modules/dl_handlers/dl_svn | 4 ++--
var/lib/sorcery/modules/dl_handlers/dl_wget | 2 +-
var/lib/sorcery/modules/libcast | 9 +++++++++
var/lib/sorcery/modules/libsorcery | 1 +
var/lib/sorcery/modules/libtrack | 6 +++++-
9 files changed, 62 insertions(+), 16 deletions(-)

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

1.14.2-rc4

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

dl_wget: no-check-certificate hint is applied less liberally #14739

(cherry-picked from commit 5f2d8cd515c258fe0ad716e460ba8411e2297f74)

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

* dl_svn: be verbose when updating too #14770

(cherry-picked from commit 82b43eddbccb1c884e7c345b2e93dc453addab41)

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

made cast --recast-optionals imply -c

(cherry-picked from commit 18956fc416f020c50741a679a96e63fa343c172e)

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

cast, cast.8: mention the need for the -c option with -B and -R

(cherry-picked from commit c90db3ce7e5e8dd25f1bb25deba786f6f5ea93b8)

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

libsorcery: remove the (empty) safe dir at the end of filter()

(cherry-picked from commit a5afffd8189ad23998fded9185c67ef492c59c88)

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

libtrack: add the queuing factors to the volume label of the cache,
to make lookups from caches easier and faster #14723

(cherry-picked from commit 1ba07aa8a06e969385bf879b849d41bb799a148e)

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

libcast: uniq the compile log before copying in create_compile_log
example with my plethora of wine logs:
508091
392282

So it will save a bit of space too. :)

(cherry-picked from commit d21d89ccd570bb26403264847ecc3b67e8d5d434)

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

Revert "* cast: don't resurrect the spell if it needs an update"

too slow the old way

This reverts commit 799a4c25c1b8fe418c18e4aa2b99981750eca4b7.

diff --git a/ChangeLog b/ChangeLog
index f586e92..20c29cc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,28 @@
+2008-10-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * dl_wget: no-check-certificate hint is applied less liberally #14739
+
+2008-10-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * dl_svn: be verbose when updating too #14770
+
+2008-09-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ made cast --recast-optionals imply -c
+
+2008-09-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cast, cast.8: mention the need for the -c option with -B and -R
+
+2008-09-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: remove the (empty) safe dir at the end of filter()
+
+2008-09-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack: add the queuing factors to the volume label of the cache,
+ to make lookups from caches easier and faster #14723
+
+2008-09-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcast: uniq the compile log before copying in create_compile_log
+
2008-09-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libgpg: added another message suggesting to update sorcery-pubkeys
if
things go wrong; it is displayed if the spell needs an update #13752
- * cast: don't resurrect the spell if it needs an update

2008-09-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libgrimoire: fixed install_desktop_files for staging
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 3c31f82..6cc56f9 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.2-rc3
+1.14.2-rc4
diff --git a/usr/sbin/cast b/usr/sbin/cast
index f9bd26c..c79ca7e 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -50,9 +50,13 @@ Optional Parameters:
in the order you wish them to be searched.

-R | --recast-down Recursively recast depended-upon spells, even
- if they are already installed...
--B | --recast-up Recursively recast dependent spells, even
- if they are already installed...
+ if they are already installed. You probably
+ also want to pass the -c flag to make sure
they
+ are recompiled, not resurrected.
+
+-B | --recast-up Recursively recast dependent spells. You
+ probably also want to pass the -c flag to
make
+ sure they are recompiled, not resurrected.

-O | --recast-optional [option] If a spell being built has spells which
could optionally depend on it, but those
@@ -60,7 +64,7 @@ Optional Parameters:
the dependee. Optional parameter can be
option can be one of: "always", "ask-yes",
"ask-no", or "ignore"; it defaults to what
- is set via the sorcery menu.
+ is set via the sorcery menu. Implies -c.

-Z | --lazy-updates [option] Perform updates on installed spells that
need updates. Optional parameter same as
@@ -106,7 +110,7 @@ function process_parameters() {
-R|--recast-down) RECAST_DOWN="$1"; shift 1
;;
-B|--recast-up) RECAST_UP="$1"; shift 1
;;
-O|--recast-optional) get_option "$2" "$DEFAULT_RECAST_OPTIONALS" \
- RECAST_OPTIONALS n
+ RECAST_OPTIONALS n; COMPILE="-c";
shift
$n ;;
-Z|--lazy-updates) get_option "$2" "$DEFAULT_LAZY_DEPENDS_UPDATE" \
LAZY_DEPENDS_UPDATES n
@@ -567,9 +571,7 @@ function pass_four() {
if [[ ! $VERSION ]] ; then
message "Can't find spell version for some reason, is $SPELL a spell?"
else
- can_resurrect $SPELL $VERSION &> /dev/null &&
- ! does_spell_need_update $SPELL &> /dev/null &&
- do_resurrect=yes
+ can_resurrect $SPELL $VERSION &> /dev/null && do_resurrect=yes
fi
fi

diff --git a/usr/share/man/man8/cast.8 b/usr/share/man/man8/cast.8
old mode 100644
new mode 100755
index f22343d..527de38
--- a/usr/share/man/man8/cast.8
+++ b/usr/share/man/man8/cast.8
@@ -65,15 +65,24 @@ Forces redownloading of sources, sources are freshly
downloaded
even when we already have them.
.SS "-R, --recast-down"
recasts all the spells the given spell(s) depend on
-(and the ones they depend on ...).
+(and the ones they depend on ...). You probably also want to specify
+.IR "-c"
+to make sure they are recompiled and not resurrected.
This might be quite a lot of spells.
+
.SS "-B, --recast-up"
recasts all the spells that depend on the given spell(s)
-(and the ones they depend on ...).
+(and the ones they depend on ...). You probably also want to specify
+.IR "-c"
+to make sure they are recompiled and not resurrected.
+
.SS "-O, --recast-optional [option]"
If a spell being built has spells which could optionally depend on it, but
those
dependencies are disabled, ask to recast the dependee. Option can be one of:
"always",
"ask-yes", "ask-no", or "ignore"; it defaults to what is set via the sorcery
menu.
+Implies
+.IR "-c" .
+
.SS "-Z, --lazy-updates [option]"
Perform updates on installed spells that need updates. Optional parameter
are the same as above.
.SS "-b, --force-base-dep"
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index c9e8a76..cd71806 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -48,8 +48,8 @@ function dl_svn_get () {

if test -d $target; then
message "${MESSAGE_COLOR}Running svn update...${DEFAULT_COLOR}"
- echo svn update $svn_args -q --non-interactive -r $SVN_TAG $target
- svn update $svn_args -q --non-interactive -r $SVN_TAG $target
+ echo svn update $svn_args --non-interactive -r $SVN_TAG $target
+ svn update $svn_args --non-interactive -r $SVN_TAG $target
rc=$?
eval "$dl_target=\"$target\""
else
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_wget
b/var/lib/sorcery/modules/dl_handlers/dl_wget
index 216154a..27e5f1f 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_wget
+++ b/var/lib/sorcery/modules/dl_handlers/dl_wget
@@ -117,7 +117,7 @@ function dl_wget_set_options() {
fi

local check_certificate
- if list_find "$hints" no-check-certificate; then
+ if list_find "$hints" no-check-certificate && [[ $(url_get_prefix "$URL")
== https ]]; then
check_certificate=--no-check-certificate
fi

diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index f17d884..5ba604c 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -624,6 +624,7 @@ function acquire_cast_lock() {
## our compile log directory.
#---------------------------------------------------------------------
function create_compile_log() {
+ local tmp_log=$C_LOG.2

message "${MESSAGE_COLOR}Creating compile log" \
"${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION$EXTENSION" \
@@ -632,11 +633,19 @@ function create_compile_log() {
echo "---config.log---" >> $C_LOG
cat $SOURCE_DIRECTORY/config.log >> $C_LOG
fi
+
+ # remove any nplicated lines (happens due to all the redirection we do)
+ uniq $C_LOG > $tmp_log
+ mv $tmp_log $C_LOG
+
+ # install the compile log
if [ -z "$EXTENSION" ]; then
cp $C_LOG $COMPILE_LOGS/$SPELL-$VERSION
else
$COMPRESSBIN -f < $C_LOG > $COMPILE_LOGS/$SPELL-$VERSION$EXTENSION
fi
+
+ # install the castfs log
if [[ $STAGED_INSTALL == on ]] ; then
message "${MESSAGE_COLOR}Creating castfs debug log" \

"${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION.castfs.dbglog$EXTENSION" \
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 70440b5..f7b5a19 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -531,6 +531,7 @@ function filter() {
else
cat
fi
+ rmdir $TMP_SSF 2>/dev/null
else
cat
fi
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index c9a2aa9..9e9a29b 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -354,6 +354,10 @@ function create_cache_archive() {

message "${MESSAGE_COLOR}Creating cache file" \
"${FILE_COLOR}${CACHE_COMP}${DEFAULT_COLOR}"
+ # gather the queuing factors, so we can include them in the label, saving
us the
+ # need to compute the spell name and a few untars when dealing with just a
cache
+ local label
+ label="$SPELL ${VERSION:-0} ${PATCHLEVEL:-0} ${SECURITY_PATCH:-0}
${UPDATED:-0}"

local TMP_DATA=$TMP_DIR/foo.data
local TMP_MDATA=$TMP_DIR/foo.mdata
@@ -361,7 +365,7 @@ function create_cache_archive() {

pushd $STATE_ROOT/ &>/dev/null
install_log_filter $STATE_ROOT "." < $TMP_MDATA |
- tar --no-recursion -cPf "$CACHE" -T -
+ tar --no-recursion -cPf "$CACHE" -V "$label" -T -
popd &>/dev/null

pushd $INSTALL_ROOT/ &>/dev/null



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (d24861b6b5d451c229e95d5950d0c328abe5a1d8), Jaka Kranjc, 10/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page