Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (7f3509f2a4fa0a21107501039a6528e2e456c214)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7f3509f2a4fa0a21107501039a6528e2e456c214)
  • Date: Sat, 2 Jan 2010 11:20:03 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/lvm/HISTORY | 3 +++
disk/lvm/REPAIR^none^PRE_SUB_DEPENDS | 5 +++++
disk/lvm/REPAIR^none^SUB_DEPENDS | 6 ++++++
gnome2-libs/gnome-python-desktop/HISTORY | 4 ++++
gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS | 1 +
gnome2-libs/gnome-python-desktop/REPAIR^none^SUB_DEPENDS | 5 +++++
6 files changed, 24 insertions(+)

New commits:
commit 7f3509f2a4fa0a21107501039a6528e2e456c214
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-python-desktop: Updated/added repair files for Bug #15515

commit 5e49f09361469bdb3df2c7bdd7ec01c21c24d719
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lvm: Add repair files for Bug #15517

diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 578ff03..f92fd31 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2010-01-02 Eric Sandall <sandalle AT sourcemage.org>
+ * REPAR^none^*: Add repair files for Bug #15517
+
2009-12-18 Eric Sandall <sandalle AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing all of LVM to be built
Fixes Bug #15517
diff --git a/disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
b/disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0b139d2
--- /dev/null
+++ b/disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LVM_FULL) [[ "$LVM_DM_ONLY" == "n" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/disk/lvm/REPAIR^none^SUB_DEPENDS
b/disk/lvm/REPAIR^none^SUB_DEPENDS
new file mode 100755
index 0000000..7c24e9b
--- /dev/null
+++ b/disk/lvm/REPAIR^none^SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ LVM_FULL) LVM_DM_ONLY=n &&
+ persistent_add LVM_DM_ONLY ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY
b/gnome2-libs/gnome-python-desktop/HISTORY
index b5efe72..978fe61 100644
--- a/gnome2-libs/gnome-python-desktop/HISTORY
+++ b/gnome2-libs/gnome-python-desktop/HISTORY
@@ -1,3 +1,7 @@
+2010-01-02 Eric Sandall <sandalle AT sourcemage.org>
+ * REPAIR^none^PRE_SUB_DEPENDS: Updated for Bug #15515
+ * REPAIR^none^SUB_DEPENDS: Added for Bug #15515
+
2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing librsvg2 (Bug #15515)

diff --git a/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
index 15362d4..24ee9ab 100755
--- a/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
+LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
esac
return 1
diff --git a/gnome2-libs/gnome-python-desktop/REPAIR^none^SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/REPAIR^none^SUB_DEPENDS
new file mode 100755
index 0000000..12ad4f0
--- /dev/null
+++ b/gnome2-libs/gnome-python-desktop/REPAIR^none^SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+GTKHTML2) echo "gtkhtml2 bindings requested, forcing them."; depends
gtkhtml2;;
+LIBRSVG2) echo "librsvg2 support requested, forcing it."; depends librsvg2
'--enable-rsvg';;
+ *) echo "unknown sub-depends!"; return 1;;
+esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (7f3509f2a4fa0a21107501039a6528e2e456c214), Eric Sandall, 01/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page