Fix for to the startup service problem on upgrade.

Fix for circular dependency between CASA and Gnome Keyring.
Fix for yast grey out button.
This commit is contained in:
Cameron (Kamran) Mashayekhi 2006-05-22 21:14:34 +00:00
parent a601b19764
commit 0e2f327e7c
22 changed files with 339 additions and 190 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Monday May 22 14:01:31 MST 2006 - cmashayekhi@novell.com
- Fixed dependency cycle between CASA <-> gnome-keyring.
- Bug 176736. Fixed micasad startup/shutdown process to clean up
open files on shutdown and upgrade.
-------------------------------------------------------------------
Wed May 11 18:33:25 MST 2006 - jnorman@novell.com
- Bug 174093. Set our process name to CASAManager so gnome-keyring

View File

@ -1,5 +1,6 @@
#!/bin/bash
# Adding CASA pam entries to pam files.
rm -f *.rpmsave
for file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
do
if [ -f $file ]

View File

@ -0,0 +1,18 @@
#!/bin/bash
set -x
#
CFG=`rpm -qa |grep -i ^casa-[1-9]`
if [ "$CFG" != "" ]
then
PAM=`find /etc/pam.d -exec grep -i casa \{\} \;`
if [ "$PAM" != "" ]
then
exit 0
else
exit 1
fi
else
exit 1
fi

View File

@ -11,10 +11,8 @@
# Short-Description: miCASA daemon
# Description: miCASA daemon
### END INIT INFO
MICASAD_BIN=/usr/sbin/micasad.sh
MICASAD_PID=/var/run/micasad.pid
MICASAD_MONO=/usr/bin/mono
MICASAD_BIN=/usr/sbin/micasad.sh
test -x $MICASAD_BIN || exit 5
. /etc/rc.status
@ -31,16 +29,39 @@ test -x $MICASAD_BIN || exit 5
# First reset status of this service
rc_reset
function pid_exists()
{
test -f /var/run/micasad.pid 2> /dev/null
}
function process_running()
{
kill -0 `cat /var/run/micasad.pid` 2> /dev/null
}
function is_running()
{
pid_exists && process_running
}
case "$1" in
start)
echo "Starting miCASA daemon"
/sbin/startproc -f $MICASAD_BIN
if ! is_running; then \
echo -n "Starting miCASA daemon"
$MICASAD_BIN
fi
# Remember status and be verbose
rc_status -v
;;
stop)
echo "Shutting down micasad "
killproc -p $MICASAD_PID -TERM $MICASAD_MONO
if is_running; then \
echo -n "Shutting down miCASA daemon"
#killproc -TERM $MICASAD_BIN
pid=`cat /var/run/micasad.pid` >/dev/null 2>&1
kill -s TERM $pid >/dev/null 2>&1
fi
# Remember status and be verbose
rc_status -v
@ -87,8 +108,12 @@ case "$1" in
rc_status
;;
status)
echo "Checking micasad service ..."
checkproc -p $MICASAD_PID $MICASAD_BIN
echo -n "Checking miCASA daemon"
if pid_exists && ! process_running 2> /dev/null; then \
rc_failed 1
elif ! pid_exists && ! process_running 2> /dev/null; then \
rc_failed 3
fi
rc_status -v
;;

View File

@ -0,0 +1,39 @@
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
main(int argc, char *argv[])
{
int no_fds = 0;
int fd = -1;
int rc = 0;
pid_t sid;
/*
* Fork a child process
* Exit parent
* Change directory to "/"
* Redirect stdin, stdout, stderr to "/dev/null"
*/
rc = daemon (0, 0);
if ( rc < 0 )
{
exit(EXIT_FAILURE);
}
/* Create a new session */
setsid();
/* Set the file mode creation mask */
umask(022);
/* Close the associated standard file descriptors */
close(STDIN_FILENO);
close(STDOUT_FILENO);
close(STDERR_FILENO);
/* Start micasad */
return execv ("/usr/bin/mono", argv);
}

View File

@ -8,4 +8,4 @@ fi
export MONO_PATH=/usr/lib$ARCH_LIB/
mono /usr/bin/micasad.exe
exec /usr/sbin/micasad-init /usr/bin/micasad.exe

View File

@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: yast2-CASA 1.6.515\n"
"Project-Id-Version: yast2-CASA 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-05-05 15:48-0600\n"
"PO-Revision-Date: 2006-05-05 15:48-0600\n"
"POT-Creation-Date: 2006-05-22 10:27-0600\n"
"PO-Revision-Date: 2006-05-22 10:27-0600\n"
"Last-Translator: Cameron Mashayekhi <root@alborz.provo.novell.com>\n"
"Language-Team: English <en@translate.freefriends.org>\n"
"MIME-Version: 1.0\n"
@ -137,7 +137,7 @@ msgstr "Configuration summary ..."
#. NovellCasa configure1 dialog caption
#. NovellCasa configure2 dialog caption
#. Initialization dialog caption
#: src/complex.ycp:87 src/dialogs.ycp:47 src/dialogs.ycp:84
#: src/complex.ycp:93 src/dialogs.ycp:47 src/dialogs.ycp:84
#: src/wizards.ycp:163
msgid "CASA Configuration"
msgstr "CASA Configuration"
@ -145,20 +145,20 @@ msgstr "CASA Configuration"
#. Frame label
#. term contents = Wizard_hw::DetectedContent(_("CASA to Configure"),
#. unconfigured, false, configured);
#: src/complex.ycp:98
#: src/complex.ycp:104
msgid " CASA Configuration Wizard Pages "
msgstr " CASA Configuration Wizard Pages "
#: src/complex.ycp:102
#: src/complex.ycp:108
msgid "&Configure CASA"
msgstr "&Configure CASA"
#: src/complex.ycp:105
#: src/complex.ycp:111
msgid "&Unconfigure CASA"
msgstr "&Unconfigure CASA"
#. CASA overview dialog caption
#: src/complex.ycp:207
#: src/complex.ycp:250
msgid "CASA Overview"
msgstr "CASA Overview"
@ -168,11 +168,11 @@ msgstr "CASA Overview"
#. `header(_("Number"), _("CASA")),
#. overview, nil, nil, nil, nil );
#. contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0);
#: src/complex.ycp:219
#: src/complex.ycp:262
msgid "CASA Configuration Wizard Pages"
msgstr "CASA Configuration Wizard Pages"
#: src/complex.ycp:223
#: src/complex.ycp:266
msgid "Re&start Wizard"
msgstr "Re&start Wizard"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-05-05 15:48-0600\n"
"POT-Creation-Date: 2006-05-22 10:27-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -137,7 +137,7 @@ msgstr ""
#. NovellCasa configure1 dialog caption
#. NovellCasa configure2 dialog caption
#. Initialization dialog caption
#: src/complex.ycp:87 src/dialogs.ycp:47 src/dialogs.ycp:84
#: src/complex.ycp:93 src/dialogs.ycp:47 src/dialogs.ycp:84
#: src/wizards.ycp:163
msgid "CASA Configuration"
msgstr ""
@ -145,20 +145,20 @@ msgstr ""
#. Frame label
#. term contents = Wizard_hw::DetectedContent(_("CASA to Configure"),
#. unconfigured, false, configured);
#: src/complex.ycp:98
#: src/complex.ycp:104
msgid " CASA Configuration Wizard Pages "
msgstr ""
#: src/complex.ycp:102
#: src/complex.ycp:108
msgid "&Configure CASA"
msgstr ""
#: src/complex.ycp:105
#: src/complex.ycp:111
msgid "&Unconfigure CASA"
msgstr ""
#. CASA overview dialog caption
#: src/complex.ycp:207
#: src/complex.ycp:250
msgid "CASA Overview"
msgstr ""
@ -168,11 +168,11 @@ msgstr ""
#. `header(_("Number"), _("CASA")),
#. overview, nil, nil, nil, nil );
#. contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0);
#: src/complex.ycp:219
#: src/complex.ycp:262
msgid "CASA Configuration Wizard Pages"
msgstr ""
#: src/complex.ycp:223
#: src/complex.ycp:266
msgid "Re&start Wizard"
msgstr ""

View File

@ -73,7 +73,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE =
CREATE_PKGCONFIG_NOARCH_TRUE = #
CREATE_PKGCONFIG_TRUE = #
CYGPATH_W = echo
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.515\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.515\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.515\"
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\"
ECHO_C =
ECHO_N = -n
ECHO_T =
@ -88,11 +88,11 @@ LTLIBOBJS =
MAINTAINER = casa <casa@novell.com>
MAKEINFO = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run makeinfo
PACKAGE = yast2-CASA
PACKAGE_BUGREPORT = http://www.suse.de/feedback
PACKAGE_BUGREPORT = http://bugs.opensuse.org/
PACKAGE_NAME = yast2-CASA
PACKAGE_STRING = yast2-CASA 1.6.515
PACKAGE_STRING = yast2-CASA 1.6.0
PACKAGE_TARNAME = yast2-CASA
PACKAGE_VERSION = 1.6.515
PACKAGE_VERSION = 1.6.0
PATH_SEPARATOR = :
PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig
RPMNAME = yast2-CASA
@ -104,7 +104,7 @@ STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
VERSION = 1.6.515
VERSION = 1.6.0
XGETTEXT = /usr/bin/xgettext
YCPC = /usr/bin/ycpc
YCPDOC = /usr/lib/YaST2/bin/ycpdoc

View File

@ -1,8 +1,8 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.515.
@%:@ Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.0.
@%:@
@%:@ Report bugs to <http://www.suse.de/feedback>.
@%:@ Report bugs to <http://bugs.opensuse.org/>.
@%:@
@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
@%:@ This configure script is free software; the Free Software Foundation
@ -269,9 +269,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='yast2-CASA'
PACKAGE_TARNAME='yast2-CASA'
PACKAGE_VERSION='1.6.515'
PACKAGE_STRING='yast2-CASA 1.6.515'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
PACKAGE_VERSION='1.6.0'
PACKAGE_STRING='yast2-CASA 1.6.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@ -728,7 +728,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures yast2-CASA 1.6.515 to adapt to many kinds of systems.
\`configure' configures yast2-CASA 1.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -795,7 +795,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of yast2-CASA 1.6.515:";;
short | recursive ) echo "Configuration of yast2-CASA 1.6.0:";;
esac
cat <<\_ACEOF
@ -812,7 +812,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <http://www.suse.de/feedback>.
Report bugs to <http://bugs.opensuse.org/>.
_ACEOF
fi
@ -908,7 +908,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
yast2-CASA configure 1.6.515
yast2-CASA configure 1.6.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -922,7 +922,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by yast2-CASA $as_me 1.6.515, which was
It was created by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1652,7 +1652,7 @@ fi
# Define the identity of the package.
PACKAGE='yast2-CASA'
VERSION='1.6.515'
VERSION='1.6.0'
cat >>confdefs.h <<_ACEOF
@ -1863,7 +1863,7 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6
VERSION="1.6.515"
VERSION="1.6.0"
RPMNAME="yast2-CASA"
MAINTAINER="casa <casa@novell.com>"
@ -2693,7 +2693,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by yast2-CASA $as_me 1.6.515, which was
This file was extended by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -2748,7 +2748,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
yast2-CASA config.status 1.6.515
yast2-CASA config.status 1.6.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -1,8 +1,8 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.515.
@%:@ Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.0.
@%:@
@%:@ Report bugs to <http://www.suse.de/feedback>.
@%:@ Report bugs to <http://bugs.opensuse.org/>.
@%:@
@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
@%:@ This configure script is free software; the Free Software Foundation
@ -269,9 +269,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='yast2-CASA'
PACKAGE_TARNAME='yast2-CASA'
PACKAGE_VERSION='1.6.515'
PACKAGE_STRING='yast2-CASA 1.6.515'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
PACKAGE_VERSION='1.6.0'
PACKAGE_STRING='yast2-CASA 1.6.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@ -728,7 +728,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures yast2-CASA 1.6.515 to adapt to many kinds of systems.
\`configure' configures yast2-CASA 1.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -795,7 +795,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of yast2-CASA 1.6.515:";;
short | recursive ) echo "Configuration of yast2-CASA 1.6.0:";;
esac
cat <<\_ACEOF
@ -812,7 +812,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <http://www.suse.de/feedback>.
Report bugs to <http://bugs.opensuse.org/>.
_ACEOF
fi
@ -908,7 +908,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
yast2-CASA configure 1.6.515
yast2-CASA configure 1.6.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -922,7 +922,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by yast2-CASA $as_me 1.6.515, which was
It was created by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1652,7 +1652,7 @@ fi
# Define the identity of the package.
PACKAGE='yast2-CASA'
VERSION='1.6.515'
VERSION='1.6.0'
cat >>confdefs.h <<_ACEOF
@ -1863,7 +1863,7 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6
VERSION="1.6.515"
VERSION="1.6.0"
RPMNAME="yast2-CASA"
MAINTAINER="casa <casa@novell.com>"
@ -2693,7 +2693,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by yast2-CASA $as_me 1.6.515, which was
This file was extended by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -2748,7 +2748,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
yast2-CASA config.status 1.6.515
yast2-CASA config.status 1.6.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -480,7 +480,7 @@ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
AC_SUBST([am__tar])
AC_SUBST([am__untar])
])
m4trace:configure.in:6: -1- AC_INIT([yast2-CASA], [1.6.515], [http://www.suse.de/feedback], [yast2-CASA])
m4trace:configure.in:6: -1- AC_INIT([yast2-CASA], [1.6.0], [http://bugs.opensuse.org/], [yast2-CASA])
m4trace:configure.in:6: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.in:6: -1- m4_pattern_forbid([_AC_])
m4trace:configure.in:6: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])

View File

@ -1,4 +1,4 @@
m4trace:configure.in:6: -1- AC_INIT([yast2-CASA], [1.6.515], [http://www.suse.de/feedback], [yast2-CASA])
m4trace:configure.in:6: -1- AC_INIT([yast2-CASA], [1.6.0], [http://bugs.opensuse.org/], [yast2-CASA])
m4trace:configure.in:6: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.in:6: -1- m4_pattern_forbid([_AC_])
m4trace:configure.in:6: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])

View File

@ -1,7 +1,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by yast2-CASA configure 1.6.515, which was
It was created by yast2-CASA configure 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ ./configure
@ -12,9 +12,9 @@ generated by GNU Autoconf 2.59. Invocation command line was
hostname = alborz
uname -m = x86_64
uname -r = 2.6.16-20-smp
uname -r = 2.6.16.11-7-smp
uname -s = Linux
uname -v = #1 SMP Mon Apr 10 04:51:13 UTC 2006
uname -v = #1 SMP Wed Apr 26 06:58:16 UTC 2006
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@ -100,7 +100,7 @@ configure:2429: creating ./config.status
## Running config.status. ##
## ---------------------- ##
This file was extended by yast2-CASA config.status 1.6.515, which was
This file was extended by yast2-CASA config.status 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES =
@ -158,7 +158,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE=''
CREATE_PKGCONFIG_NOARCH_TRUE='#'
CREATE_PKGCONFIG_TRUE='#'
CYGPATH_W='echo'
DEFS='-DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.515\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.515\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.515\" '
DEFS='-DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\" '
ECHO_C=''
ECHO_N='-n'
ECHO_T=''
@ -173,11 +173,11 @@ LTLIBOBJS=''
MAINTAINER='casa <casa@novell.com>'
MAKEINFO='${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run makeinfo'
PACKAGE='yast2-CASA'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_NAME='yast2-CASA'
PACKAGE_STRING='yast2-CASA 1.6.515'
PACKAGE_STRING='yast2-CASA 1.6.0'
PACKAGE_TARNAME='yast2-CASA'
PACKAGE_VERSION='1.6.515'
PACKAGE_VERSION='1.6.0'
PATH_SEPARATOR=':'
PKG_CONFIG_PATH='/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig'
RPMNAME='yast2-CASA'
@ -189,7 +189,7 @@ STYLESHEET_HTML='/usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl'
STYLESHEET_PDF='/usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl'
STYLESHEET_YCPDOC='/usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl'
STYLESHEET_YDOC='/usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl'
VERSION='1.6.515'
VERSION='1.6.0'
XGETTEXT='/usr/bin/xgettext'
YCPC='/usr/bin/ycpc'
YCPDOC='/usr/lib/YaST2/bin/ycpdoc'
@ -257,11 +257,11 @@ ystartupdir='${prefix}/lib/YaST2'
## ----------- ##
#define PACKAGE "yast2-CASA"
#define PACKAGE_BUGREPORT "http://www.suse.de/feedback"
#define PACKAGE_BUGREPORT "http://bugs.opensuse.org/"
#define PACKAGE_NAME "yast2-CASA"
#define PACKAGE_STRING "yast2-CASA 1.6.515"
#define PACKAGE_STRING "yast2-CASA 1.6.0"
#define PACKAGE_TARNAME "yast2-CASA"
#define PACKAGE_VERSION "1.6.515"
#define VERSION "1.6.515"
#define PACKAGE_VERSION "1.6.0"
#define VERSION "1.6.0"
configure: exit 0

View File

@ -259,7 +259,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by yast2-CASA $as_me 1.6.515, which was
This file was extended by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -292,7 +292,7 @@ $config_files
Report bugs to <bug-autoconf@gnu.org>."
ac_cs_version="\
yast2-CASA config.status 1.6.515
yast2-CASA config.status 1.6.0
configured by ./configure, generated by GNU Autoconf 2.59,
with options \" 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig'\"
@ -439,9 +439,9 @@ s,@SHELL@,/bin/sh,;t t
s,@PATH_SEPARATOR@,:,;t t
s,@PACKAGE_NAME@,yast2-CASA,;t t
s,@PACKAGE_TARNAME@,yast2-CASA,;t t
s,@PACKAGE_VERSION@,1.6.515,;t t
s,@PACKAGE_STRING@,yast2-CASA 1.6.515,;t t
s,@PACKAGE_BUGREPORT@,http://www.suse.de/feedback,;t t
s,@PACKAGE_VERSION@,1.6.0,;t t
s,@PACKAGE_STRING@,yast2-CASA 1.6.0,;t t
s,@PACKAGE_BUGREPORT@,http://bugs.opensuse.org/,;t t
s,@exec_prefix@,${prefix},;t t
s,@prefix@,/usr,;t t
s,@program_transform_name@,s,x,x,,;t t
@ -460,7 +460,7 @@ s,@mandir@,${prefix}/share/man,;t t
s,@build_alias@,,;t t
s,@host_alias@,,;t t
s,@target_alias@,,;t t
s,@DEFS@,-DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.515\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.515\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.515\" ,;t t
s,@DEFS@,-DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\" ,;t t
s,@ECHO_C@,,;t t
s,@ECHO_N@,-n,;t t
s,@ECHO_T@,,;t t
@ -482,7 +482,7 @@ s,@INSTALL_SCRIPT@,${INSTALL},;t t
s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
s,@CYGPATH_W@,echo,;t t
s,@PACKAGE@,yast2-CASA,;t t
s,@VERSION@,1.6.515,;t t
s,@VERSION@,1.6.0,;t t
s,@ACLOCAL@,${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run aclocal-1.9,;t t
s,@AUTOCONF@,${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run autoconf,;t t
s,@AUTOMAKE@,${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run automake-1.9,;t t

28
casa-yast/configure vendored
View File

@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.515.
# Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.0.
#
# Report bugs to <http://www.suse.de/feedback>.
# Report bugs to <http://bugs.opensuse.org/>.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@ -269,9 +269,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='yast2-CASA'
PACKAGE_TARNAME='yast2-CASA'
PACKAGE_VERSION='1.6.515'
PACKAGE_STRING='yast2-CASA 1.6.515'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
PACKAGE_VERSION='1.6.0'
PACKAGE_STRING='yast2-CASA 1.6.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@ -728,7 +728,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures yast2-CASA 1.6.515 to adapt to many kinds of systems.
\`configure' configures yast2-CASA 1.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -795,7 +795,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of yast2-CASA 1.6.515:";;
short | recursive ) echo "Configuration of yast2-CASA 1.6.0:";;
esac
cat <<\_ACEOF
@ -812,7 +812,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <http://www.suse.de/feedback>.
Report bugs to <http://bugs.opensuse.org/>.
_ACEOF
fi
@ -908,7 +908,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
yast2-CASA configure 1.6.515
yast2-CASA configure 1.6.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -922,7 +922,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by yast2-CASA $as_me 1.6.515, which was
It was created by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1652,7 +1652,7 @@ fi
# Define the identity of the package.
PACKAGE='yast2-CASA'
VERSION='1.6.515'
VERSION='1.6.0'
cat >>confdefs.h <<_ACEOF
@ -1863,7 +1863,7 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6
VERSION="1.6.515"
VERSION="1.6.0"
RPMNAME="yast2-CASA"
MAINTAINER="casa <casa@novell.com>"
@ -2693,7 +2693,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by yast2-CASA $as_me 1.6.515, which was
This file was extended by yast2-CASA $as_me 1.6.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -2748,7 +2748,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
yast2-CASA config.status 1.6.515
yast2-CASA config.status 1.6.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -1,9 +1,9 @@
dnl configure.in for yast2-CASA
dnl
dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-CASA, 1.6.515, http://www.suse.de/feedback, yast2-CASA)
AC_INIT(yast2-CASA, 1.6.0, http://bugs.opensuse.org/, yast2-CASA)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@ -17,7 +17,7 @@ AC_PREFIX_DEFAULT(/usr)
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
VERSION="1.6.515"
VERSION="1.6.0"
RPMNAME="yast2-CASA"
MAINTAINER="casa <casa@novell.com>"

View File

@ -92,7 +92,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE =
CREATE_PKGCONFIG_NOARCH_TRUE = #
CREATE_PKGCONFIG_TRUE = #
CYGPATH_W = echo
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.515\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.515\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.515\"
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\"
ECHO_C =
ECHO_N = -n
ECHO_T =
@ -107,11 +107,11 @@ LTLIBOBJS =
MAINTAINER = casa <casa@novell.com>
MAKEINFO = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run makeinfo
PACKAGE = yast2-CASA
PACKAGE_BUGREPORT = http://www.suse.de/feedback
PACKAGE_BUGREPORT = http://bugs.opensuse.org/
PACKAGE_NAME = yast2-CASA
PACKAGE_STRING = yast2-CASA 1.6.515
PACKAGE_STRING = yast2-CASA 1.6.0
PACKAGE_TARNAME = yast2-CASA
PACKAGE_VERSION = 1.6.515
PACKAGE_VERSION = 1.6.0
PATH_SEPARATOR = :
PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig
RPMNAME = yast2-CASA
@ -123,7 +123,7 @@ STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
VERSION = 1.6.515
VERSION = 1.6.0
XGETTEXT = /usr/bin/xgettext
YCPC = /usr/bin/ycpc
YCPDOC = /usr/lib/YaST2/bin/ycpdoc

View File

@ -84,7 +84,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE =
CREATE_PKGCONFIG_NOARCH_TRUE = #
CREATE_PKGCONFIG_TRUE = #
CYGPATH_W = echo
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.515\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.515\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.515\"
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\"
ECHO_C =
ECHO_N = -n
ECHO_T =
@ -99,11 +99,11 @@ LTLIBOBJS =
MAINTAINER = casa <casa@novell.com>
MAKEINFO = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run makeinfo
PACKAGE = yast2-CASA
PACKAGE_BUGREPORT = http://www.suse.de/feedback
PACKAGE_BUGREPORT = http://bugs.opensuse.org/
PACKAGE_NAME = yast2-CASA
PACKAGE_STRING = yast2-CASA 1.6.515
PACKAGE_STRING = yast2-CASA 1.6.0
PACKAGE_TARNAME = yast2-CASA
PACKAGE_VERSION = 1.6.515
PACKAGE_VERSION = 1.6.0
PATH_SEPARATOR = :
PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig
RPMNAME = yast2-CASA
@ -115,7 +115,7 @@ STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
VERSION = 1.6.515
VERSION = 1.6.0
XGETTEXT = /usr/bin/xgettext
YCPC = /usr/bin/ycpc
YCPDOC = /usr/lib/YaST2/bin/ycpdoc

View File

@ -43,15 +43,18 @@ include "CASA/helps.ycp";
* Return a modification status
* @return true if data was modified
*/
boolean Modified() {
boolean Modified()
{
return NovellCasa::Modified();
}
boolean ReallyAbort() {
boolean ReallyAbort()
{
return !NovellCasa::Modified() || Popup::ReallyAbort(true);
}
boolean PollAbort() {
boolean PollAbort()
{
return UI::PollInput() == `abort;
}
@ -59,7 +62,8 @@ boolean PollAbort() {
* Read settings dialog
* @return `abort if aborted and `next otherwise
*/
symbol ReadDialog() {
symbol ReadDialog()
{
Wizard::RestoreHelp(HELPS["read"]:"");
// NovellCasa::AbortFunction = PollAbort;
boolean ret = NovellCasa::Read();
@ -70,7 +74,8 @@ symbol ReadDialog() {
* Write settings dialog
* @return `abort if aborted and `next otherwise
*/
symbol WriteDialog() {
symbol WriteDialog()
{
Wizard::RestoreHelp(HELPS["write"]:"");
// NovellCasa::AbortFunction = PollAbort;
boolean ret = NovellCasa::Write();
@ -81,7 +86,8 @@ symbol WriteDialog() {
* Summary dialog
* @return dialog result
*/
any SummaryDialog() {
any SummaryDialog()
{
/* CASA summary dialog caption */
string caption = _("CASA Configuration");
@ -96,99 +102,135 @@ any SummaryDialog() {
// unconfigured, false, configured);
term contents = `Frame(_(" CASA Configuration Wizard Pages "),
`VBox(
`VSpacing(),
`VSpacing(),
`PushButton(`id(`install_casa_button),`opt(`default), _("&Configure CASA")),
`VSpacing(),
`VSpacing(),
`PushButton(`id(`uninstall_casa_button),`opt(`default), _("&Unconfigure CASA")),
`VSpacing(),
`VSpacing()
));
`VBox(
`VSpacing(),
`VSpacing(),
`PushButton(`id(`install_casa_button),`opt(`default), _("&Configure CASA")),
`VSpacing(),
`VSpacing(),
`PushButton(`id(`uninstall_casa_button),`opt(`default), _("&Unconfigure CASA")),
`VSpacing(),
`VSpacing()
));
Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"",
Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"",
Label::BackButton(), Label::FinishButton());
any ret = nil;
while(true) {
integer iConfig_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/iscasaconfiged");
ret = UI::UserInput();
if(iConfig_CASAReturn == 0)
{
UI::ChangeWidget(`id(`install_casa_button), `Enabled, false);
}
else
{
UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false);
}
/* abort? */
if(ret == `abort || ret == `cancel || ret == `back) {
if(ReallyAbort()) break;
else continue;
any ret = nil;
while(true)
{
ret = UI::UserInput();
/* abort? */
if(ret == `abort || ret == `cancel || ret == `back) {
if(ReallyAbort()) break;
else continue;
}
/* overview dialog */
else if(ret == `edit_button) {
else if(ret == `edit_button)
{
ret = `overview;
break;
}
/* configure the selected device */
else if(ret == `configure_button) {
else if(ret == `configure_button)
{
// TODO FIXME: check for change of the configuration
any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem);
if(selected == `other) {
if(selected == `other)
{
ret = `other;
}
else {
else
{
ret = `configure;
}
break;
}
else if(ret == `next) {
else if(ret == `next)
{
break;
}
else if(ret == `install_casa_button) {
else if(ret == `install_casa_button)
{
// launch the install script here
y2milestone ("SummaryDialog() launch the install script");
integer iInstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/installcasa");
if(iInstall_CASAReturn == 0)
if(iConfig_CASAReturn != 0)
{
y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/installcasa) returned: %1",iInstall_CASAReturn));
Popup::Message(sformat("YaST Configured CASA successfully."));
}
else if(iInstall_CASAReturn == 127)
{
Popup::Error(sformat("YaST was unable to find the installcasa script."));
}
else if(iInstall_CASAReturn == 126)
{
Popup::Error(sformat("YaST requires root privleges to run the installcasa script."));
}
else
{
Popup::Error(sformat("The install_casa script returned an unknown error: %1",iInstall_CASAReturn));
// launch the install script here
y2milestone ("SummaryDialog() launch the install script");
integer iInstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/installcasa");
if(iInstall_CASAReturn == 0)
{
y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/installcasa) returned: %1",iInstall_CASAReturn));
Popup::Message(sformat("YaST Configured CASA successfully."));
}
else if(iInstall_CASAReturn == 127)
{
Popup::Error(sformat("YaST was unable to find the installcasa script."));
}
else if(iInstall_CASAReturn == 126)
{
Popup::Error(sformat("YaST requires root privleges to run the installcasa script."));
}
else
{
Popup::Error(sformat("The install_casa script returned an unknown error: %1",iInstall_CASAReturn));
}
UI::ChangeWidget(`id(`install_casa_button), `Enabled, false);
UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false);
}
continue;
}
else if(ret == `uninstall_casa_button) {
// launch the uninstall script here
y2milestone ("SummaryDialog() launch the uninstall script");
integer iUninstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/uninstallcasa");
if(iUninstall_CASAReturn == 0)
else if(ret == `uninstall_casa_button)
{
if(iConfig_CASAReturn == 0)
{
y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/uninstallcasa) returned: %1",iUninstall_CASAReturn));
Popup::Message(sformat("YaST Unconfigured CASA successfully."));
}
else if(iUninstall_CASAReturn == 127)
{
Popup::Error(sformat("YaST was unable to find the uninstallcasa script."));
}
else if(iUninstall_CASAReturn == 126)
{
Popup::Error(sformat("YaST requires root privleges to run the uninstallcasa script."));
}
else
{
Popup::Error(sformat("The uninstall_casa script returned an unknown error: %1",iUninstall_CASAReturn));
}
// launch the uninstall script here
y2milestone ("SummaryDialog() launch the uninstall script");
integer iUninstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/uninstallcasa");
if(iUninstall_CASAReturn == 0)
{
y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/uninstallcasa) returned: %1",iUninstall_CASAReturn));
Popup::Message(sformat("YaST Unconfigured CASA successfully."));
}
else if(iUninstall_CASAReturn == 127)
{
Popup::Error(sformat("YaST was unable to find the uninstallcasa script."));
}
else if(iUninstall_CASAReturn == 126)
{
Popup::Error(sformat("YaST requires root privleges to run the uninstallcasa script."));
}
else
{
Popup::Error(sformat("The uninstall_casa script returned an unknown error: %1",iUninstall_CASAReturn));
}
UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false);
UI::ChangeWidget(`id(`install_casa_button), `Enabled, false);
}
continue;
}
else {
else
{
y2error("unexpected retcode: %1", ret);
continue;
}
@ -201,7 +243,8 @@ any SummaryDialog() {
* Overview dialog
* @return dialog result
*/
any OverviewDialog() {
any OverviewDialog()
{
/* CASA overview dialog caption */
string caption = _("CASA Overview");
@ -228,36 +271,42 @@ any OverviewDialog() {
Label::BackButton(), Label::FinishButton());
any ret = nil;
while(true) {
while(true)
{
ret = UI::UserInput();
/* abort? */
if(ret == `abort || ret == `cancel) {
if(ret == `abort || ret == `cancel)
{
if(ReallyAbort()) break;
else continue;
}
/* add */
else if(ret == `add_button) {
else if(ret == `add_button)
{
/* FIXME */
ret = `add;
break;
}
/* edit */
else if(ret == `edit_button) {
else if(ret == `edit_button)
{
/* FIXME */
ret = `edit;
break;
}
/* delete */
else if(ret == `delete_button) {
else if(ret == `delete_button)
{
/* FIXME */
continue;
}
else if(ret == `next || ret == `back) {
else if(ret == `next || ret == `back)
{
break;
}
else {
else
{
y2error("unexpected retcode: %1", ret);
continue;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 22 14:10:16 MDT 2006 - cmashayekhi@novell.com
- Bug 171136. Fixed to gray out proper button before and
after configuration in yast.
-------------------------------------------------------------------
Mon May 08 08:43:20 MDT 2006 - cmashayekhi@novell.com

View File

@ -17,7 +17,8 @@
Name: @PACKAGE@
URL: http://www.novell.com/products
BuildRequires: gcc-c++ glade-sharp glib-sharp glib2-devel gnome-filesystem gnome-keyring-devel gtk-sharp gtk-sharp-gapi gtk2-devel java2-devel-packages mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel
# BuildRequires: gcc-c++ glade-sharp glib-sharp glib2-devel gnome-filesystem gnome-keyring-devel gtk-sharp gtk-sharp-gapi gtk2-devel java2-devel-packages mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel
BuildRequires: gcc-c++ glade-sharp glib-sharp glib2-devel gnome-filesystem gtk-sharp gtk-sharp-gapi gtk2-devel java2-devel-packages mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel
%define prefix /usr/share/doc/packages
%define bin_prefix /usr
License: LGPL
@ -116,6 +117,7 @@ install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{
install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.FireFox.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{binsource}/%{cfg}/micasad.exe %{buildroot}%{bin_prefix}/bin
install -m 755 %{binsource}/%{cfg}/micasad-init %{buildroot}%{bin_prefix}/bin
install -m 755 %{binsource}/%{cfg}/CASAManager.exe %{buildroot}%{bin_prefix}/bin
install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
@ -127,6 +129,7 @@ install -m 755 c_micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/sbin
install -m 755 c_micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/sbin
install -m 755 c_micasad/startup/installcasa %{buildroot}%{bin_prefix}/sbin
install -m 755 c_micasad/startup/uninstallcasa %{buildroot}%{bin_prefix}/sbin
install -m 755 c_micasad/startup/iscasaconfiged %{buildroot}%{bin_prefix}/sbin
install -m 755 %{_lib}/%{cfg}/pam_micasa.so %{buildroot}/%{_lib}/security
@ -216,9 +219,11 @@ rm -rf $RPM_BUILD_ROOT
%{bin_prefix}/sbin/casaucfgpam
%{bin_prefix}/sbin/installcasa
%{bin_prefix}/sbin/uninstallcasa
%{bin_prefix}/sbin/iscasaconfiged
%{bin_prefix}/sbin/micasad.sh
%{bin_prefix}/bin/micasad.exe
%{bin_prefix}/bin/micasad-init
%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
%{prefix}/CASA/doc/License.txt