Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Jaka Kranjc (4cf3d954bd007a336c4e720bd686c678682e139f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Jaka Kranjc (4cf3d954bd007a336c4e720bd686c678682e139f)
  • Date: Fri, 16 Mar 2007 16:28:56 -0500

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

var/lib/quill/ChangeLog | 3 +++
var/lib/quill/modules/libupdate | 6 +++++-
var/lib/quill/version | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)

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

libupdate: added variable detection to multiversion_check

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index a7998c5..3b4e9ed 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,6 @@
+2007-03-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libupdate: added variable detection to multiversion_check
+
2007-03-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* libcore: don't mess with the capitalisation so early
* libperlcpan: don't grab the metadata until sure we have
diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index 7a13b85..e06d899 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -271,13 +271,17 @@ function ask_and_copy_over()
#---
function multiversion_check()
{
- if [[ ${#versions[@]} != 1 ]]
+ local suggestions
+ # we uniqed the versions, as we can't handle dupes, so we need a double
check
+ if [[ ${#versions[@]} != 1 || $(grep -c "\<VERSION=" DETAILS) != 1 ]]
then #we have a problem
message "Oh dear, detected a multiversion spell. Going to cat DETAILS
for you "
message "and then you will tell me which variable I need to set, so I
can get "
message "to the correct version ($version)."
sleep 3
cat DETAILS
+ suggestions=$(sed -n 's,[{}],,g; s,^.*if.*$\([A-Za-z_]*\).*$,\1,p'
DETAILS)
+ [[ ! -z $suggestions ]] && query_msg "Perhaps it is one of these:"
$suggestions
query_string if_var "${QUERY_COLOR}Please enter the appropriate
variable. Example: UGU_DEVEL=y${DEFAULT_COLOR} "
fi
}
diff --git a/var/lib/quill/version b/var/lib/quill/version
index d25d752..ee77cc6 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc9
+0.2.4-rc10



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (4cf3d954bd007a336c4e720bd686c678682e139f), Jaka Kranjc, 03/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page