Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (c9152dcf27fbdc76efecf500cb1b0bb2f337342d)

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 test-1.14 sorcery by Jaka Kranjc (c9152dcf27fbdc76efecf500cb1b0bb2f337342d)
  • Date: Sat, 1 Jan 2011 08:59:36 -0600

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/libsorcery | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)

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

1.14.6-rc1

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

libsorcery: avoid passing bad parameters when PAGER has none

(cherry-picked from commit c0ff54d58b1e3c8f45b7218dd53b45fcb71bb2df)

diff --git a/ChangeLog b/ChangeLog
index 9aae007..ba923ad 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-01-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: avoid passing bad parameters when PAGER has none
+
2010-12-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: default the pager to cat if nothing is specified and
less
is not present on the system
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 344cb51..172ab12 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.5-rc2
+1.14.6-rc1
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index ed5ff6b..a455efc 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -1663,6 +1663,8 @@ function set_pager() {
local pager_prog
local pager_params=${PAGER#* }
smgl_basename "${PAGER%% *}" pager_prog
+ # setting PAGER to a single word would give bad parameters
+ [[ $pager_prog == $PAGER ]] && unset pager_params

# TODO: add any needed options for the rest of the pagers
case $pager_prog in



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (c9152dcf27fbdc76efecf500cb1b0bb2f337342d), Jaka Kranjc, 01/01/2011

Archive powered by MHonArc 2.6.24.

Top of Page