Skip to Content.
Sympa Menu

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

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 (5f2d8cd515c258fe0ad716e460ba8411e2297f74)
  • Date: Thu, 2 Oct 2008 13:48:28 -0500

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

ChangeLog | 6 ++++++
install | 16 ++++++++++++----
var/lib/sorcery/modules/dl_handlers/dl_svn | 4 ++--
var/lib/sorcery/modules/dl_handlers/dl_wget | 2 +-
var/lib/sorcery/modules/libmisc | 21 +++++++++++++++++++++
var/lib/sorcery/modules/libsorcery | 1 +
var/lib/sorcery/modules/libsummon | 2 ++
7 files changed, 45 insertions(+), 7 deletions(-)

New commits:
commit 5f2d8cd515c258fe0ad716e460ba8411e2297f74
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

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

install, libsorcery, libsummon, libmisc: check that SOURCE_CACHE is a dir
#14731
based on a patch by Arjan Bouter

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

* dl_svn: be verbose when updating too #14770

diff --git a/ChangeLog b/ChangeLog
index 98258bd..0a3534d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * dl_svn: be verbose when updating too #14770
+ * install, libmisc, libsorcery, libsummon: check that SOURCE_CACHE is
a
+ dir #14731; based on a patch by Arjan Bouter
+ * dl_wget: no-check-certificate hint is applied less liberally #14739
+
2008-09-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends, libmisc: fixed bad real_list_find invocations #14743
* cast, cast.8: mention the need for the -c option with -B and -R
diff --git a/install b/install
index a061d6b..01cb2cb 100755
--- a/install
+++ b/install
@@ -69,15 +69,23 @@ for COMPILER in "cc" "gcc" "c++" "g++"; do
done
popd &>/dev/null

-mkdir -p \
- "${INSTALL_ROOT}/usr/src" \
+for DIR in "${INSTALL_ROOT}/usr/src" \
"${INSTALL_ROOT}/var/cache/sorcery" \
"${INSTALL_ROOT}/var/spool/sorcery" \
"${INSTALL_ROOT}/var/log/sorcery/compile" \
"${INSTALL_ROOT}/var/log/sorcery/install" \
"${INSTALL_ROOT}/var/log/sorcery/md5sum" \
"${INSTALL_ROOT}/var/log/sorcery/queue" \
- "${INSTALL_ROOT}/var/state/sorcery"
+ "${INSTALL_ROOT}/var/state/sorcery"; do
+ if ! [[ -d $DIR ]]; then
+ if [[ -e $DIR ]]; then
+ echo "$DIR is not a directory, but already exists!"
+ echo "Please correct this and retry!"
+ exit 1
+ fi
+ mkdir -p "$DIR"
+ fi
+done

# Create other files which should exist, but aren't installed by sorcery
for FILE in \
@@ -85,7 +93,7 @@ for FILE in \
"${INSTALL_ROOT}/etc/sorcery/local/compile_config" \
"${INSTALL_ROOT}/var/state/sorcery/packages" \
"${INSTALL_ROOT}/var/state/sorcery/depends" \
- "${INSTALL_ROOT}/var/log/sorcery/activity"
+ "${INSTALL_ROOT}/var/log/sorcery/activity"

do
if ! [[ -x "$FILE" ]]; then
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 f906f65..4138a53 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_wget
+++ b/var/lib/sorcery/modules/dl_handlers/dl_wget
@@ -116,7 +116,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/libmisc b/var/lib/sorcery/modules/libmisc
index a7c55b0..81a9238 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -466,6 +466,27 @@ function get_dirnames() {
}

#---------------------------------------------------------------------
+## @param directory to check
+## @Stderr error if the input is not a directory, but something else
+## @return 0 on success
+## @return >0 on failure
+##
+## Checks whether the passed directory exists and if not, tries to
+## create it, first checking if it already exists as something else.
+#---------------------------------------------------------------------
+function ensure_dir() {
+ if ! [[ -d $1 ]]; then
+ if [[ -e $1 ]]; then
+ message "${PROBLEM_COLOR}$1 exists, but is not a directory!" \
+ "Please correct this and retry.${DEFAULT_COLOR}"
+ return 1
+ else
+ mkdir -p "$1"
+ fi
+ fi
+}
+
+#---------------------------------------------------------------------
## @param The function to call on each itteration and it's arguments
## @param The separator string. If there is no $3, only the first char
counts
## @param The string to itterate over. (optional)
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 0391010..cbb6ca5 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -70,6 +70,7 @@ function update_sorcery_scripts() {
local FILENAME=$TMP_DIR/$SOURCE
# copy the tarball to /var/spool/sorcery after we've downloaded and
# verified it.
+ ensure_dir "$SOURCE_CACHE"
cp $FILENAME $SOURCE_CACHE

mk_source_dir $SOURCE_DIRECTORY &&
diff --git a/var/lib/sorcery/modules/libsummon
b/var/lib/sorcery/modules/libsummon
index fa729e7..5547d99 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -190,6 +190,8 @@ function download_src_args() {
local urls="$2"
local hints="$3"

+ ensure_dir "$SOURCE_CACHE"
+
message "${MESSAGE_COLOR}Downloading source file" \
"${FILE_COLOR}${target}${DEFAULT_COLOR}" \
"${REASON}"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (5f2d8cd515c258fe0ad716e460ba8411e2297f74), Jaka Kranjc, 10/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page