Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4f5090d508179d7dd9252e71cefa143abb6e2fb1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4f5090d508179d7dd9252e71cefa143abb6e2fb1)
  • Date: Wed, 19 Sep 2007 12:34:27 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

gnome2-apps/gnumeric/CONFIGURE | 8 ++++----
gnome2-apps/gnumeric/HISTORY | 5 +++++
gnome2-apps/gnumeric/PREPARE | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 4f5090d508179d7dd9252e71cefa143abb6e2fb1
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gnumeric: don't chain persistent_read with && or the spell fails if
gnumeric2 vars aren't set

diff --git a/gnome2-apps/gnumeric/CONFIGURE b/gnome2-apps/gnumeric/CONFIGURE
index 07f9de6..7ed87ee 100755
--- a/gnome2-apps/gnumeric/CONFIGURE
+++ b/gnome2-apps/gnumeric/CONFIGURE
@@ -1,9 +1,9 @@
if [[ -z $SSCONVERT ]]; then
# not configured yet, get old config data from gnumeric2 spell
- persistent_read gnumeric2 SSCONVERT SSCONVERT &&
- persistent_read gnumeric2 SSINDEX SSINDEX &&
- persistent_read gnumeric2 SOLVER SOLVER &&
- persistent_read gnumeric2 LONGDOUBLE LONGDOUBLE &&
+ persistent_read gnumeric2 SSCONVERT SSCONVERT
+ persistent_read gnumeric2 SSINDEX SSINDEX
+ persistent_read gnumeric2 SOLVER SOLVER
+ persistent_read gnumeric2 LONGDOUBLE LONGDOUBLE
persistent_add SSCONVERT SSINDEX SOLVER LONGDOUBLE
fi &&
config_query SSCONVERT "Build ssconvert (cmd line sreadsheet conversion
tool)?" y &&
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 2103fab..e8d6841 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,8 @@
+2007-09-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE, PREPARE: removed the && after the persistent_reads, they
+ return false if the variable isn't set, which is not an error for
+ us, bug #14001
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.7.11
* Note: I had to comment the "if [[ -z" sections in PREPARE and
diff --git a/gnome2-apps/gnumeric/PREPARE b/gnome2-apps/gnumeric/PREPARE
index 2387152..b280374 100755
--- a/gnome2-apps/gnumeric/PREPARE
+++ b/gnome2-apps/gnumeric/PREPARE
@@ -1,5 +1,5 @@
if [[ -z $GNUMERIC_DEVEL ]]; then
- persistent_read gnumeric2 GNUMERIC_DEVEL GNUMERIC_DEVEL &&
+ persistent_read gnumeric2 GNUMERIC_DEVEL GNUMERIC_DEVEL
persistent_add GNUMERIC_DEVEL
fi &&
config_query GNUMERIC_DEVEL "Build devel (unstable) version?" n



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4f5090d508179d7dd9252e71cefa143abb6e2fb1), Arwed von Merkatz, 09/19/2007

Archive powered by MHonArc 2.6.24.

Top of Page