Attachment 299766 Details for Bug 439634 – Better error messages, support single-backend installs

[patch] Better error messages, support single-backend installs

totem-backend-better-error-message.patch (text/plain), 2.99 KB, created by Stewart Adam on 2008-03-31 21:24:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stewart Adam

Created: 2008-03-31 21:24:02 UTC

Size: 2.99 KB

patch

obsolete

>Index: totem-bin-backend-ondemand.sh
>===================================================================
>RCS file: /cvs/extras/rpms/totem/devel/totem-bin-backend-ondemand.sh,v
>retrieving revision 1.3
>diff -u -r1.3 totem-bin-backend-ondemand.sh
>--- totem-bin-backend-ondemand.sh	19 Mar 2008 18:10:31 -0000	1.3
>+++ totem-bin-backend-ondemand.sh	31 Mar 2008 21:22:05 -0000
>@@ -16,35 +16,42 @@
> 	exit 1
> }
> 
>-set_backend() {
>+check_exists() {
>+  # We've already run checks, this value is valid.
> 	TOTEM_BACKEND=$1
>-	# Default to GStreamer if there's no config
>-	if [ -z $TOTEM_BACKEND ] ; then
>-		echo "*** No backend name passed ***"
>-		usage
>-	fi
>-	# Default to GStreamer if the backend is invalid
>-	if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then
>-		echo "*** Invalid backend name ***"
>-		usage
>-	fi
>-  _LIBDIR="$(rpm --eval '%{_libdir}')"
>-  if [ -f $_LIBDIR/libbaconvideowidget-gstreamer.so.0.0.0 ];then
>-    if [ -f $_LIBDIR/libbaconvideowidget-xine.so.0.0.0 ];then
>-      # only if both files exist
>-      /usr/sbin/alternatives --set totem-backend $_LIBDIR/libbaconvideowidget-$TOTEM_BACKEND.so.0.0.0
>-    else
>-      echo -e 'Error: The xine backend was not found! Please check your totem installation.'
>-      exit 1
>-    fi
>-  else
>-    echo -e 'Error: The gstreamer backend was not found! Please check your totem installation.'
>+  # Are we missing the requested backend?
>+  if [ ! -f $_LIBDIR/libbaconvideowidget-$TOTEM_BACKEND.so.0.0.0 ];then
>+    echo -e "Error: Cannot use backend $TOTEM_BACKEND, it is not installed."
>+    echo -e "Please verify your installation";
>     exit 1
>   fi
>-	exit 0
>+}
>+
>+set_backend() {
>+  # We've already run checks, this value is valid and it exists
>+	TOTEM_BACKEND=$1
>+  /usr/sbin/alternatives --set totem-backend $_LIBDIR/libbaconvideowidget-$TOTEM_BACKEND.so.0.0.0
> }
> # end functions
> 
>+_LIBDIR="$(rpm --eval '%{_libdir}')"
>+TOTEM_BACKEND=$2
>+BIN=$3
>+# Check for valid backend
>+# Default to GStreamer if there's no config
>+if [ -z $TOTEM_BACKEND ] ; then
>+	echo "Error: No backend name passed."
>+	usage
>+fi
>+# Default to GStreamer if the backend is invalid
>+if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then
>+	echo "Error: Invalid backend name."
>+	usage
>+fi
>+
>+# Does the requested backend exist?
>+check_exists $2
>+
> # If root, just try to set the default backend
> if [ "$UID" -eq "0" ] ; then
> 	if [ "$1" != "-b" -o -z "$2" ] ; then
>@@ -55,20 +62,16 @@
> 	if [ "$1" != "-b" -o -z "$2" ] ; then
> 		usage;
> 	fi
>-	TOTEM_BACKEND=$2
>-
> 	if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then
>-		echo "*** Invalid backend name passed ***"
>+		echo "Error: Invalid backend name."
> 		usage
> 	fi
>-
>-	BIN=$3
> 	if [ -z "$BIN" ] ; then
>-		echo "*** No program name passed ***"
>+		echo "Error: No program name passed."
> 		usage
> 	fi
> 	if [ $BIN != "totem" -a $BIN != "totem-audio-preview" -a $BIN != "totem-video-indexer" -a $BIN != "totem-video-thumbnailer" ] ; then
>-		echo "*** Wrong program name ***"
>+		echo "Error: Wrong program name."
> 		usage
> 	fi
> 	shift 3

Actions: View | Diff

Attachments on bug 439634: 299737 | 299766