Skip to Content.
Sympa Menu

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

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 (f3cb2400df25d407d102d452957565a8d8fa60f7)
  • Date: Sun, 12 Aug 2007 07:57:03 -0500

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

ChangeLog | 2 ++
usr/sbin/scribe | 17 ++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)

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

fixed scribe add rm -rfing if the passed (bad) argument is a dir #13742

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

scribe: fixed bad messages when adding a grimoire #13743

diff --git a/ChangeLog b/ChangeLog
index fa62c80..35f6eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* gaze: fixed bad temporary dir usage #13588
* libsummon, scribe: added the missing prefixes to the guess lists
#13732
* liburl, scribe: don't ignore url_get_prefix exit status #13729
+ * scribe: fixed bad messages when adding a grimoire #13743
+ fixed scribe add rm -rfing if the passed (bad) argument is a dir
#13742

2007-08-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: fixed a regression in private_add_depends;
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index aa08470..617d628 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -162,9 +162,24 @@ function scribe_add() {
continue
fi

+ # avoid deleting $grimoire if it is a dir #13742
+ if [[ -d $grimoire ]]; then
+ message "${PROBLEM_COLOR}The grimoire $grimoire is an" \
+ "exsisting directory! Refusing to add!${DEFAULT_COLOR}"
+ continue
+ fi
+
+ local grim_name="$grimoire"
# derive a full grimoire name
grimoire=$(codex_canonicalize_grimoire_name $grimoire)
- message "Adding grimoire $grim_name to $grim_dir from $from"
+ local grim_dir
+ smgl_dirname "$grimoire" grim_dir
+
+ if [[ -z $from ]]; then
+ message "Adding grimoire $grim_name to $grim_dir"
+ else
+ message "Adding grimoire $grim_name to $grim_dir from $from"
+ fi
scribe_add_update_worker "$grimoire" "$from" add
done
}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f3cb2400df25d407d102d452957565a8d8fa60f7), Jaka Kranjc, 08/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page