Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ec8a5d8fb49dedaf76d74debf1c6328d5ade1824)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ec8a5d8fb49dedaf76d74debf1c6328d5ade1824)
  • Date: Fri, 29 Aug 2008 18:57:06 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

xorg-xserver/xorg-server/HISTORY | 5 ++-
xorg-xserver/xorg-server/UP_TRIGGERS | 54
++++++++++++++---------------------
2 files changed, 27 insertions(+), 32 deletions(-)

New commits:
commit ec8a5d8fb49dedaf76d74debf1c6328d5ade1824
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xorg-server: fixed syntax error in UP_TRIGGERS: that's why clean code is
_good_

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index d51ccaa..6b099a8 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2008-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: fixed weird syntax error (missing `then'): that's why
+ ";" rocks, and "\n" doesn't, cleaned up
+
2008-08-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* UP_TRIGGERS: re-added with migration magic as well

@@ -231,4 +235,3 @@

2005-11-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, HISTORY: created spell
-
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
index e5ceef2..27dfc50 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -4,17 +4,14 @@
local provider
local spell

-for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb
-do
- for spell in $(gaze depends $provider 1 | cut -d: -f1)
- do
+for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb; do
+ for spell in $(gaze depends $provider 1 | cut -d: -f1); do
#
# Recast each spell still using monolithic X, if it's installed
# See http://bugs.sourcemage.org/show_bug.cgi?id=14373 for the issue
# with Sorcery not switching out a no longer available provider
#
- if spell_ok $spell
- then
+ if spell_ok $spell; then
up_trigger $spell cast_self
fi
done # Finished spell loop
@@ -26,7 +23,7 @@ unset provider spell
local provider
local spell

-if spell_ok $SPELL &&
+if spell_ok $SPELL &&
[[ $(installed_version $SPELL) == 1.3.0.0 ]] &&
[[ $(installed_version $SPELL) == 1.2.99.903 ]] &&
[[ $(installed_version $SPELL) == 1.2.99.902 ]] &&
@@ -36,8 +33,7 @@ if spell_ok $SPELL &&
[[ $(installed_version $SPELL) == 1.1.1 ]] &&
[[ $(installed_version $SPELL) == 1.0.1 ]] &&
[[ $(installed_version $SPELL) == 1.0.0 ]] &&
- [[ $(installed_version $SPELL) == 0.99.4 ]]
-then
+ [[ $(installed_version $SPELL) == 0.99.4 ]]; then
for spell in linuxwacom \
xf86-input-synaptics \
synaptics \
@@ -120,13 +116,11 @@ then
xf86-video-wsfb \
xf86-video-geode \
xf86-input-diamondtouch \
- mesalib
-do
- if spell_ok $spell
- then
- up_trigger $spell check_self
- fi
-done
+ mesalib; do
+ if spell_ok $spell; then
+ up_trigger $spell check_self
+ fi
+ done
fi

# this still seems to be a good idea overall
@@ -135,19 +129,17 @@ unset provider spell
local provider
local spell

-if spell_ok $SPELL &&
-for spell in xkbutils \
- xkbcomp \
- xkbprint \
- xkbevd \
- libxkbui \
- libxkbfile \
- xkeyboard-config \
- setxkbmap
-do
- if spell_ok $spell
- then
- up_trigger $spell check_self
- fi
-done
+if spell_ok $SPELL; then
+ for spell in xkbutils \
+ xkbcomp \
+ xkbprint \
+ xkbevd \
+ libxkbui \
+ libxkbfile \
+ xkeyboard-config \
+ setxkbmap; do
+ if spell_ok $spell; then
+ up_trigger $spell check_self
+ fi
+ done
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ec8a5d8fb49dedaf76d74debf1c6328d5ade1824), Vlad Glagolev, 08/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page