Skip to Content.
Sympa Menu

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

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 (f0859a650ce2370bdfe2bfb6ec69c05b81888f54)
  • Date: Mon, 25 Aug 2008 17:01:46 -0500

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

ChangeLog | 9 +++++++++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/libdepends | 1 +
var/lib/sorcery/modules/libtablet | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)

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

1.14.1-rc7

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

2008-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: removed a variable leak causing problems for hard deps
on
providers - previous query's choice was used as default, usually
resulting in the first choice being the default, since the value
was not in the list; patch by Mikael Morin #14681

(cherry-picked from commit 52f9b52ef46a5aa4ecee546b4c8f0497af393d29)

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

libtablet: REPAIR^all can now "repair" non-existing files

(cherry-picked from commit a9d72e2724d382b57c7c42ec6173ca0e7a631e44)

diff --git a/ChangeLog b/ChangeLog
index f6b3cb4..a51ca66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: removed a variable leak causing problems for hard deps
on
+ providers - previous query's choice was used as default, usually
+ resulting in the first choice being the default, since the value
+ was not in the list; patch by Mikael Morin #14681
+
+2008-08-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtablet: REPAIR^all can now "repair" non-existing files
+
2008-08-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* dl_git: use the multicall git binary; the hardlinks aren't available
by default anymore since 1.6 #14648
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 18ac5b0..1a9fdf3 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc6
+1.14.1-rc7
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 2024044..44fd654 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -892,6 +892,7 @@ function work_depends_provider()

debug "libdepends" "$FUNCNAME - $@"
local default tmp installed=no
+ local choices
local status=()

local failure_ok=$1
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index a4f168a..32d4169 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -660,7 +660,7 @@ function tablet_check_repair_file() {
esac

if ! [[ $tablet_file ]] ; then
- if [[ $key == none ]] ; then
+ if [[ $key == none ]] || [[ $key == all ]]; then
# WARNING: tb_version specific path derivation here:
tablet_file=$page/$type/$name
replace=1



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (f0859a650ce2370bdfe2bfb6ec69c05b81888f54), Jaka Kranjc, 08/25/2008

Archive powered by MHonArc 2.6.24.

Top of Page