Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77735 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 77735 by Juuso Alasuutari for review
  • Date: Thu, 13 Apr 2006 16:15:01 +0100 (BST)

Change 77735 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/04/13
16:10:25

Fix bug #10919

Affected files ...

... //sgl/grimoires/devel/kde-core/kdebase/BUILD#10 edit
... //sgl/grimoires/devel/kde-core/kdebase/HISTORY#37 edit

Differences ...

==== //sgl/grimoires/devel/kde-core/kdebase/BUILD#10 (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,14 +11,17 @@
# OPTS="$OPTS --with-krb5auth"
#fi &&

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

# Backup existing kdm dir
-OLD_VERSION=$(installed_version $SPELL) &&
-if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]] &&
+# (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..." &&
+ 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

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

@@ -1,3 +1,8 @@
+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
+ the patch!
+
2006-04-07 Juuso Alasuutari <iuso AT sourcemage.org>
* REPAIR^none^volatiles: Deleted
* REPAIR^0^volatiles: Added



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

Archive powered by MHonArc 2.6.24.

Top of Page