Skip to Content.
Sympa Menu

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

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 (2be6636ac2041de21314c0e95884214e68a30e53)
  • Date: Wed, 26 Mar 2008 05:45:32 -0500

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

ChangeLog | 1 +
var/lib/sorcery/modules/libsorcery | 33 ++++++++++++++++++++-------------
2 files changed, 21 insertions(+), 13 deletions(-)

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

cleaned up guess_filename
TODO: since fuzzy matching is disabled, check if this is needed at all
currently it has many callers

diff --git a/ChangeLog b/ChangeLog
index 77f2feb..b0f87c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2008-03-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: deprecated dirnames() for get_dirnames() in libmisc
+ cleaned up guess_filename
* libmisc: adjusted formatting in get_dirnames and get_basenames and
made
them use the faster internal smgl_dirname and smgl_basename
respectively
* libdispel, libmisc: fixed the only three callers to use get_dirnames
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index b2afdcb..075d76a 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -210,21 +210,28 @@ function report() {
#---------------------------------------------------------------------
function guess_filename() {

- FILENAME=$1
+ local filename=$1

- debug "libsorcery" "Running guess_filename() on $FILENAME"
+ debug "libsorcery" "Running guess_filename() on $filename"

- BASENAME=`echo $FILENAME |
- sed "s/\.tar\.gz$//" |
- sed "s/\.tgz$//" |
- sed "s/\.tar\.bz2$//"`
-
- if [ -f $FILENAME ]; then echo $FILENAME
- elif [ "$FUZZ" != "on" ]; then return 1
- elif [ -f $BASENAME.tar.gz ]; then echo $BASENAME.tar.gz
- elif [ -f $BASENAME.tar.bz2 ]; then echo $BASENAME.tar.bz2
- elif [ -f $BASENAME.tgz ]; then echo $BASENAME.tgz
- else false
+ if [[ -f $filename ]]; then
+ echo $filename
+ else
+ #FIXME this is never defined, check if this function still makes sense
+ if [[ $FUZZ != on ]]; then
+ return 1
+ else
+ local basename=$(sed -r "s/\.(tar\.(gz|bz2)|tgz)$//" <<< "$filename")
+ if [[ -f $basename.tar.gz ]]; then
+ echo $basename.tar.gz
+ elif [[ -f $basename.tar.bz2 ]]; then
+ echo $basename.tar.bz2
+ elif [[ -f $basename.tgz ]]; then
+ echo $basename.tgz
+ else
+ return 1
+ fi
+ fi
fi

}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (2be6636ac2041de21314c0e95884214e68a30e53), Jaka Kranjc, 03/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page