Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b87a93b86354dd198b78fa13a2c3c56640f943ba)

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 master sorcery by Jaka Kranjc (b87a93b86354dd198b78fa13a2c3c56640f943ba)
  • Date: Sat, 1 Jan 2011 08:55:35 -0600

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

ChangeLog | 1 +
var/lib/sorcery/subroutines | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)

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

subroutines: avoid sourcing leftovers from failed patching attempts

diff --git a/ChangeLog b/ChangeLog
index be8df64..8165abd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2010-01-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: avoid passing bad parameters when PAGER has none
+ * subroutines: avoid sourcing leftovers from failed patching attempts

2010-12-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtrack, common: newer installwatch has a different log variable
#13873
diff --git a/var/lib/sorcery/subroutines b/var/lib/sorcery/subroutines
index 4d2ed21..56a8445 100755
--- a/var/lib/sorcery/subroutines
+++ b/var/lib/sorcery/subroutines
@@ -20,9 +20,11 @@


#---------------------------------------------------------------------
-# Load libraries
+# Load libraries (avoiding .orig patching leftovers)
for MODULE in "$SGL_LIBRARY_MODULES"/lib*[^~]; do
- . $MODULE
+ if [[ $MODULE == ${MODULE/.orig/} ]]; then
+ . $MODULE
+ fi
done
#---------------------------------------------------------------------




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b87a93b86354dd198b78fa13a2c3c56640f943ba), Jaka Kranjc, 01/01/2011

Archive powered by MHonArc 2.6.24.

Top of Page