[SM-Commit] PERFORCE change 77735 by Juuso Alasuutari for review

Perforce Review Daemon p4review at smee.org
Thu Apr 13 11:15:01 EDT 2006


Change 77735 by juuso_alasuutari at 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



More information about the SM-Commit mailing list