Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77769 by Juuso Alasuutari for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Jason Flatt" <jflatt AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77769 by Juuso Alasuutari for review
  • Date: Fri, 14 Apr 2006 11:30:01 +0100 (BST)

Change 77769 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/04/14
11:29:34

The Fix Returns, part gazillion. Now with standardized happy ending.

Affected files ...

... //sgl/grimoires/devel/kde-core/kdebase/BUILD#11 edit
... //sgl/grimoires/devel/kde-core/kdebase/HISTORY#38 edit

Differences ...

==== //sgl/grimoires/devel/kde-core/kdebase/BUILD#11 (xtext) ====

@@ -1,4 +1,4 @@
-OPTS="$OPTS $KDEBASE_XCONSOLE $KDEBASE_DPMS $KDEBASE_XDMCP" &&
+OPTS="$OPTS $KDEBASE_XCONSOLE $KDEBASE_DPMS $KDEBASE_XDMCP" &&

#
# Kerberos has linking errors :(
@@ -11,17 +11,17 @@
# OPTS="$OPTS --with-krb5auth"
#fi &&

-# Bail out if this part breaks, so the next chain can be avoided
-. $SECTION_DIRECTORY/KDE_BUILD || return 1
+. $SECTION_DIRECTORY/KDE_BUILD

# Backup existing kdm dir
-# (The var assignment below is unchained for a good reason until a
-# system-wide remedy is implemented, see bug 10919.)
-OLD_VERSION=$(installed_version $SPELL)
-if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]] &&
- [ -d "$INSTALL_ROOT/usr/share/config/kdm" ]; then
- mkdir -p $TMP_DIR/kdm &&
- echo "Backing up configuration files..." &&
- mv $INSTALL_ROOT/usr/share/config/kdm/{background,kdm}rc $TMP_DIR/kdm &&
- rm -rf $INSTALL_ROOT/usr/share/config/kdm
+if spell_ok $SPELL; then
+ OLD_VERSION=$(installed_version $SPELL) &&
+ if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]] &&
+ [[ -d "$INSTALL_ROOT/usr/share/config/kdm" ]]; then
+ mkdir -p $TMP_DIR/kdm &&
+ echo "Backing up configuration files..." &&
+ mv $INSTALL_ROOT/usr/share/config/kdm/{background,kdm}rc \
+ $TMP_DIR/kdm &&
+ rm -rf $INSTALL_ROOT/usr/share/config/kdm
+ fi
fi

==== //sgl/grimoires/devel/kde-core/kdebase/HISTORY#38 (text) ====

@@ -1,3 +1,7 @@
+2006-04-14 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Same fix as below, but based on spell_ok as was
+ decided is the best option.
+
2006-04-13 Juuso Alasuutari <iuso AT sourcemage.org>
* BUILD: Fixed failure to compile (bug #10919) on systems
with no previous kdebase install. Thanks to lynxlynxlynx for



  • [SM-Commit] PERFORCE change 77769 by Juuso Alasuutari for review, Perforce Review Daemon, 04/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page