Skip to Content.
Sympa Menu

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

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 (1ec41f53462fd46a60313f2872705b31100c4f35)
  • Date: Wed, 27 May 2009 12:49:54 -0500

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libstage | 4 +++-
var/lib/sorcery/modules/libtrack | 9 ++-------
3 files changed, 9 insertions(+), 8 deletions(-)

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

libtrack: made real_track_manual work with whitespace and optimised
it #15240, patch by chp

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

libstage: quoted the argument in get_all_package_files
* libtrack: made use of get_all_package_files in create_install_log

create_install_log used an additional /, but required a grep call to weed
out the sole /. The existing behaviour of get_all_package_files is perfect
for that.

diff --git a/ChangeLog b/ChangeLog
index 329c16e..159949d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* dl_git: fixed syntax error
* libresurrect: fixed installing of spell files from user owned
grimoires #14576
+ * libstage: quoted the argument in get_all_package_files
+ * libtrack: made use of get_all_package_files in create_install_log
+ * libtrack: made real_track_manual work with whitespace and optimised
+ it #15240, patch by chp

2009-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* delve.8: added delve manpage based on the draft in #15094 by Donald
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 2ea25a2..086f6dd 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -61,7 +61,9 @@ function stage_install_ordinary()
#---------------------------------------------------------------------
function get_all_package_files()
{
- find $STAGE_DIRECTORY/TRANSL | sed "s:$STAGE_DIRECTORY/TRANSL::"
+ # no point in using -printf "/%P\n" since it would cause a difference:
+ # the searchpath is now returned as empty; there it would be /
+ find "$STAGE_DIRECTORY/TRANSL" | sed "s:$STAGE_DIRECTORY/TRANSL::"
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index e26d1d0..990a763 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -45,10 +45,7 @@ function real_track_manual() {
echo "Can't tell installwatch to manually track... installwatch isn't
running."
return 1
fi
- local i
- for i in $* ; do
- [ -e $i ] && touch $i
- done
+ touch -c "$@"
return 0
}

@@ -224,9 +221,7 @@ function create_install_log() {
rm -f $OUTPUT
if [[ $STAGED_INSTALL != off ]]
then
- find "${STAGE_DIRECTORY}/TRANSL/" |
- sed "s#${STAGE_DIRECTORY}/TRANSL##g"|
- grep -v -x '/' |
+ get_all_package_files |
filter_excluded > $OUTPUT
else
parse_iw $INPUT |



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1ec41f53462fd46a60313f2872705b31100c4f35), Jaka Kranjc, 05/27/2009

Archive powered by MHonArc 2.6.24.

Top of Page