Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Wed Jan 5 15:59:50 CET 2011. -------- --- yast2/yast2.changes 2010-11-16 15:49:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-01-04 14:49:56.000000000 +0100 @@ -1,0 +2,32 @@ +Tue Jan 4 13:42:54 UTC 2011 - lslezak@suse.cz + +- check PackageKit status, suggest to quit the daemon if it is + running (bnc#659522) +- 2.20.10 + +------------------------------------------------------------------- +Mon Jan 3 17:25:36 UTC 2011 - lslezak@suse.cz + +- fixed VLAN config type detection (wrong regexp) +- 2.20.9 + +------------------------------------------------------------------- +Mon Jan 3 16:49:18 UTC 2011 - lslezak@suse.cz + +- don't abort when package checksum verification failes, ask to + download the file again (bnc#657608) +- 2.20.8 + +------------------------------------------------------------------- +Wed Dec 22 18:58:19 CET 2010 - mzugec@suse.cz + +- ifcfg-ethX.Y style config files for VLAN(fate#309240) +- 2.20.7 + +------------------------------------------------------------------- +Mon Dec 20 11:27:17 CET 2010 - mzugec@suse.cz + +- fate#306855: FCoE boot support +- 2.20.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.20.5.tar.bz2 New: ---- yast2-2.20.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.yhIkeK/_old 2011-01-05 15:59:18.000000000 +0100 +++ /var/tmp/diff_new_pack.yhIkeK/_new 2011-01-05 15:59:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2 (Version 2.20.5) +# spec file for package yast2 (Version 2.20.10) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.20.5 +Version: 2.20.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.20.5.tar.bz2 +Source0: yast2-2.20.10.tar.bz2 Prefix: /usr @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.20.5 +%setup -n yast2-2.20.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.20.5.tar.bz2 -> yast2-2.20.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/aclocal.m4 new/yast2-2.20.10/aclocal.m4 --- old/yast2-2.20.5/aclocal.m4 2010-11-12 09:59:59.000000000 +0100 +++ new/yast2-2.20.10/aclocal.m4 2011-01-04 14:47:43.000000000 +0100 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/configure new/yast2-2.20.10/configure --- old/yast2-2.20.5/configure 2010-11-12 09:59:59.000000000 +0100 +++ new/yast2-2.20.10/configure 2011-01-04 14:47:44.000000000 +0100 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for yast2 2.20.3. +# Generated by GNU Autoconf 2.67 for yast2 2.20.10. # # Report bugs to <http://bugs.opensuse.org/>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -318,7 +318,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -358,19 +358,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -532,7 +532,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.20.3' -PACKAGE_STRING='yast2 2.20.3' +PACKAGE_VERSION='2.20.10' +PACKAGE_STRING='yast2 2.20.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -744,8 +744,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -790,7 +791,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -816,7 +817,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1020,7 +1021,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1036,7 +1037,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1066,8 +1067,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1075,7 +1076,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1093,13 +1094,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1122,7 +1123,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1136,8 +1137,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1152,9 +1153,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1193,11 +1194,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1223,7 +1224,7 @@ # 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 2.20.3 to adapt to many kinds of systems. +\`configure' configures yast2 2.20.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1237,7 +1238,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1294,7 +1295,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.20.3:";; + short | recursive ) echo "Configuration of yast2 2.20.10:";; esac cat <<\_ACEOF @@ -1374,10 +1375,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.20.3 -generated by GNU Autoconf 2.65 +yast2 configure 2.20.10 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1391,8 +1392,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.20.3, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by yast2 $as_me 2.20.10, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1502,11 +1503,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##"[] echo # The following way of writing the cache mishandles newlines in values, ( @@ -1540,11 +1539,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##"[] echo for ac_var in $ac_subst_vars do @@ -1557,11 +1554,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##"[] echo for ac_var in $ac_subst_files do @@ -1575,11 +1570,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##"[] echo cat confdefs.h echo @@ -1634,7 +1627,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1649,7 +1647,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1725,7 +1727,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1742,16 +1744,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1765,7 +1773,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -1776,16 +1784,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1810,7 +1818,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -1818,7 +1826,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -1843,7 +1851,7 @@ ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi @@ -1851,7 +1859,7 @@ $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -1992,11 +2000,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2018,7 +2026,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2028,7 +2036,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2256,7 +2264,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2264,7 +2272,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2298,7 +2306,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2314,7 +2322,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.20.3' + VERSION='2.20.10' cat >>confdefs.h <<_ACEOF @@ -2436,7 +2444,7 @@ -VERSION="2.20.3" +VERSION="2.20.10" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -2539,7 +2547,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2547,7 +2555,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2610,7 +2618,7 @@ if test -z "$XGETTEXT" ; then - as_fn_error "xgettext is missing; please install gettext-tools." "$LINENO" 5 + as_fn_error $? "xgettext is missing; please install gettext-tools." "$LINENO" 5 fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` @@ -2691,7 +2699,7 @@ if test "$YCPDOC" = "false"; then - as_fn_error "ycpdoc is not installed" "$LINENO" 5 + as_fn_error $? "ycpdoc is not installed" "$LINENO" 5 fi # Extract the first word of "ycpmakedep", so it can be a program name with args. set dummy ycpmakedep; ac_word=$2 @@ -2736,7 +2744,7 @@ if test "$YCPMAKEDEP" = "false"; then - as_fn_error "ycpmakedep is not installed" "$LINENO" 5 + as_fn_error $? "ycpmakedep is not installed" "$LINENO" 5 fi # Extract the first word of "ycpc", so it can be a program name with args. set dummy ycpc; ac_word=$2 @@ -2781,16 +2789,16 @@ if test "$YCPC" = "false"; then - as_fn_error "ycpc is not installed" "$LINENO" 5 + as_fn_error $? "ycpc is not installed" "$LINENO" 5 fi as_ac_File=`$as_echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5 $as_echo_n "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_File+set}\"" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then eval "$as_ac_File=yes" else @@ -2800,8 +2808,7 @@ eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_File"\" = x"yes"; then : else @@ -2853,7 +2860,7 @@ if test "$MYEXPECT" = "false"; then - as_fn_error "expect not installed" "$LINENO" 5 + as_fn_error $? "expect not installed" "$LINENO" 5 fi # Extract the first word of "runtest", so it can be a program name with args. set dummy runtest; ac_word=$2 @@ -2897,7 +2904,7 @@ if test "$MYRUNTEST" = "false"; then - as_fn_error "dejagnu not installed" "$LINENO" 5 + as_fn_error $? "dejagnu not installed" "$LINENO" 5 fi @@ -3039,6 +3046,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -3055,11 +3063,11 @@ if test -z "${CREATE_PKGCONFIG_TRUE}" && test -z "${CREATE_PKGCONFIG_FALSE}"; then - as_fn_error "conditional \"CREATE_PKGCONFIG\" was never defined. + as_fn_error $? "conditional \"CREATE_PKGCONFIG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CREATE_PKGCONFIG_NOARCH_TRUE}" && test -z "${CREATE_PKGCONFIG_NOARCH_FALSE}"; then - as_fn_error "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. + as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -3209,19 +3217,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -3417,7 +3425,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -3470,8 +3478,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.20.3, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by yast2 $as_me 2.20.10, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3523,11 +3531,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.20.3 -configured by $0, generated by GNU Autoconf 2.65, +yast2 config.status 2.20.10 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3545,11 +3553,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -3571,6 +3584,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -3581,7 +3595,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -3724,7 +3738,7 @@ "remote/Makefile") CONFIG_FILES="$CONFIG_FILES remote/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -3760,7 +3774,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -3777,7 +3791,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -3791,18 +3805,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -3891,20 +3905,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -3922,7 +3944,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -3950,7 +3972,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -3977,7 +3999,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -4114,22 +4136,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -4144,7 +4166,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -4165,7 +4187,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/configure.in new/yast2-2.20.10/configure.in --- old/yast2-2.20.5/configure.in 2010-11-12 09:59:56.000000000 +0100 +++ new/yast2-2.20.10/configure.in 2011-01-04 14:47:40.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.20.3, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.20.10, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.3" +VERSION="2.20.10" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/modules/Version.ycp new/yast2-2.20.10/library/modules/Version.ycp --- old/yast2-2.20.5/library/modules/Version.ycp 2010-11-16 15:48:48.000000000 +0100 +++ new/yast2-2.20.10/library/modules/Version.ycp 2011-01-04 14:47:54.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.20.5"; +global string yast2 = "2.20.10"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/src/NetworkInterfaces.ycp new/yast2-2.20.10/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.20.5/library/network/src/NetworkInterfaces.ycp 2010-09-30 09:41:50.000000000 +0200 +++ new/yast2-2.20.10/library/network/src/NetworkInterfaces.ycp 2011-01-03 18:22:20.000000000 +0100 @@ -182,6 +182,8 @@ global string GetType(string dev) { string type = ifcfg_part (dev, "1"); + // test if this is VLAN (ethX.vlanid) + if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\\.[[:digit:]]+$")) return "vlan"; foreach(string dev_type,map confs, Devices, { if (haskey(confs, dev)){ string int_type = confs[dev, "INTERFACETYPE"]:""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/src/NetworkStorage.ycp new/yast2-2.20.10/library/network/src/NetworkStorage.ycp --- old/yast2-2.20.5/library/network/src/NetworkStorage.ycp 2010-01-14 16:33:12.000000000 +0100 +++ new/yast2-2.20.10/library/network/src/NetworkStorage.ycp 2010-12-27 08:07:49.000000000 +0100 @@ -40,6 +40,21 @@ } integer network_based=0; + // test for multipath + if (network_based==0 && issubstring(device, "/dev/dm-")) { + y2warning("multipath detected!"); + string dev_name = splitstring(device, "/")[2]:""; + y2milestone("Multipath device name %1", dev_name); + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name)); + y2milestone("Show slaves command:%1", cmd); + if (cmd["exit"]:-1==0){ + // FIXME: what about more slaves? + list<string> slaves = splitstring(cmd["stdout"]:"", "\n"); + integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:"")); + if (nb>0) network_based=nb; + } else y2error("Error while executed show slaves commad:%1", cmd["stderr"]:""); + } + // test for LVM if (network_based==0 && issubstring(device, "/dev/mapper/")) { y2warning("LVM detected!"); @@ -84,7 +99,7 @@ } } -// test for nfs (bnc#384420) + // test for nfs (bnc#384420) if (network_based==0) { string space="[[:space:]]"; if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ @@ -92,6 +107,21 @@ network_based=2; } } + + //test for FCoE + if (network_based==0){ + if (issubstring(device, "/dev/")){ + device = splitstring(device, "/")[2]:""; + } + string sys=sformat("/sys/class/block/%1", device); + if (FileUtils::Exists(sys)){ + if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q target", sys))==0){ + y2warning("FCoE detected!"); + network_based=3; + } + } + } + return network_based; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.out new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.out --- old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.out 2010-03-12 09:45:40.000000000 +0100 +++ new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.out 2011-01-03 18:24:04.000000000 +0100 @@ -9,6 +9,8 @@ Dump ifcfg-lo, type: lo Dump ifcfg-eth0#1, type: eth Dump ifcfg-eth1#20, type: eth +Dump ifcfg-eth0.1, type: vlan +Dump ifcfg-eth1.20, type: vlan Dump ifcfg-eth-pcmcia-0#3, type: eth Dump ifcfg-eth-usb-1#0, type: eth Dump ifcfg-tr-pcmcia-2#432, type: tr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.ycp new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.ycp --- old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.ycp 2010-03-12 09:45:40.000000000 +0100 +++ new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.ycp 2011-01-03 18:23:57.000000000 +0100 @@ -20,6 +20,8 @@ "lo", "eth0#1", "eth1#20", + "eth0.1", + "eth1.20", "eth-pcmcia-0#3", "eth-usb-1#0", "tr-pcmcia-2#432", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/packages/src/PackageCallbacks.ycp new/yast2-2.20.10/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.20.5/library/packages/src/PackageCallbacks.ycp 2010-11-12 09:59:26.000000000 +0100 +++ new/yast2-2.20.10/library/packages/src/PackageCallbacks.ycp 2011-01-03 17:53:30.000000000 +0100 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 62754 2010-11-05 13:00:44Z lslezak $ + * $Id: PackageCallbacks.ycp 63064 2011-01-03 16:53:29Z lslezak $ * */ @@ -305,7 +305,8 @@ */ global string DoneProvide (integer error, string reason, string name) { - y2milestone("DoneProvide: %1", error); + y2milestone("DoneProvide: %1, %2, %3", error, reason, name); + if (_provide_popup) { UI::CloseDialog(); @@ -318,11 +319,131 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (error != 0) + if (provide_aborted) { + provide_aborted = false; return "C"; } + // INVALID + if (error == 3) + { + // error message, %1 is a package name + string message = sformat(_("Package %1 is broken, integrity check has failed."), name); + + + if (Mode::commandline()) { + CommandLine::Print(message); + + // ask user in the interactive mode + if (CommandLine::Interactive()) + { + CommandLine::Print(""); + + // command line mode - ask user whether installation of the failed package should be retried + CommandLine::Print(_("Retry installation of the package?")); + + if (CommandLine::YesNo()) + { + // return Retry + return "R"; + } + + // command line mode - ask user whether the installation should be aborted + CommandLine::Print(_("Abort the installation?")); + if (CommandLine::YesNo()) + { + // return Abort + return "C"; + } + + // otherwise return Ignore (default) + return "I"; + } + + return "I"; + } + + term button_box = `ButtonBox ( + `PushButton (`id(`abort), `opt (`cancelButton, `key_F9), Label::AbortButton()), + `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), + `PushButton (`id(`ignore), `opt (`okButton), Label::SkipButton()) + ); + + if ( showLongInfo ) + { + UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat (_("Error: %1:"), error) + reason) ); + } + else + { + UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) ); + UI::ReplaceWidget(`id(`info), `Empty() ); + } + + any r = nil; + + repeat + { + r = UI::UserInput(); + if ( r == `show ) + { + showLongInfo = ShowLogInfo (message, button_box); + if (showLongInfo) + { + string error_symbol = "ERROR"; + + if (error == 1) + { + error_symbol = "NOT_FOUND"; + } + else if (error == 2) + { + error_symbol = "IO"; + } + else if (error == 3) + { + error_symbol = "INVALID"; + } + + UI::ReplaceWidget(`id(`info), + `RichText (`opt(`plainText), + // error message, %1 is code of the error, + // detail string is appended to the end + sformat (_("Error: %1:"), error_symbol) + reason) ); + } + else + { + UI::ReplaceWidget(`id(`info), `Empty() ); + } + } + } until (r == `abort || r == `retry || r == `ignore); + + y2milestone ("DoneProvide %1", r); + + UI::CloseDialog(); + + if (r == `abort) + return "C"; + if (r == `retry) + return "R"; + if (r == `ignore) + { + // don't show the warning when a refresh fails + if (!autorefreshing) + { + // TODO: add "Don't show again" checkbox + // a warning popup displayed after pressing [Ignore] after a download error + Popup::Warning(_("Ignoring a download failure may result in a broken system. +The system should be later verified by running the Software Management module.")); + } + + return "I"; + } + + y2error("Unknown user input: %1", r); + } + return "I"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/packages/src/PackageKit.ycp new/yast2-2.20.10/library/packages/src/PackageKit.ycp --- old/yast2-2.20.5/library/packages/src/PackageKit.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.20.10/library/packages/src/PackageKit.ycp 2011-01-04 14:31:01.000000000 +0100 @@ -0,0 +1,63 @@ +/** + * File: modules/PackageKit.ycp + * Package: yast2 + * Summary: PackageKit access functions + * Authors: Ladislav Slezak <lslezak@suse.cz> + * + * $Id:$ + * + * This is a wrrapper around PackageKit DBus interface. + */ + +{ + module "PackageKit"; + + /** + * Check whether PackageKit daemon is running + * @return boolean return true if PackageKit is currently running + */ + global boolean IsRunning() + { + string cmd = "dbus-send --system --dest=org.freedesktop.DBus --type=method_call --print-reply " + + "--reply-timeout=200 / org.freedesktop.DBus.NameHasOwner string:org.freedesktop.PackageKit"; + y2milestone("Checking PackageKit status: %1", cmd); + + map out = (map)SCR::Execute(.target.bash_output, cmd); + + boolean ret = false; + list<string> lines = splitstring(out["stdout"]:"", "\n"); + + foreach(string line, lines, + { + if (regexpmatch(line, "boolean.*true")) + { + ret = true; + } + } + ); + + y2milestone("PackageKit is running: %1", ret); + + return ret; + } + + /** + * Ask the PackageKit daemon to quit + * If a transaction is in progress the daemon will not quit, + * you have to check the current status using isRunning() function. + */ + global void SuggestQuit() + { + string cmd = "dbus-send --system --dest=org.freedesktop.PackageKit --type=method_call " + + "/org/freedesktop/PackageKit org.freedesktop.PackageKit.SuggestDaemonQuit"; + y2milestone("Asking PackageKit to quit: %1", cmd); + + integer ret = (integer)SCR::Execute(.target.bash, cmd); + + if (ret != 0) + { + y2error("dbus-send failed!"); + } + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/packages/src/PackageLock.ycp new/yast2-2.20.10/library/packages/src/PackageLock.ycp --- old/yast2-2.20.5/library/packages/src/PackageLock.ycp 2010-05-26 17:07:02.000000000 +0200 +++ new/yast2-2.20.10/library/packages/src/PackageLock.ycp 2011-01-04 14:47:26.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Packages manipulation (system) * Authors: Martin Vidner <mvidner@suse.cz> * - * $Id: PackageLock.ycp 61908 2010-04-29 10:16:18Z jsrain $ + * $Id: PackageLock.ycp 63074 2011-01-04 13:47:24Z lslezak $ * * This should be used everywhere before Pkg is first used. #160319 */ @@ -16,9 +16,45 @@ import "Popup"; import "Label"; +import "PackageKit"; boolean have_lock = nil; boolean aborted = false; +// display a different message in the first PackageKit quit confirmation +boolean packagekit_asked = false; + +/** + * Ask whether to quit PackageKit if it is running + * @return boolean true if PackageKit was asked to quit + */ +boolean AskPackageKit() +{ + boolean ret = false; + + if (PackageKit::IsRunning()) + { + // ask to send quit signal to PackageKit + string msg = packagekit_asked ? + _("PackageKit is still running (probably busy). +Ask PackageKit to quit again?") + : + _("PackageKit is blocking software management. +This happens when the updater applet or another software management +application is running. + +Ask PackageKit to quit?"); + + packagekit_asked = true; + + if (Popup::YesNo(msg)) + { + PackageKit::SuggestQuit(); + ret = true; + } + } + + return ret; +} /** * Tries to acquire the packager (zypp) lock. @@ -40,6 +76,13 @@ if (have_lock == true) break; if (have_lock != true) { + if (AskPackageKit()) + { + // let the PackageKit quit before retrying + sleep(2000); + continue; + } + try_again = (Popup::AnyQuestion ( // TRANSLATORS: a popup headline _("Accessing the Software Management Failed"), @@ -83,6 +126,13 @@ if (have_lock == true) break; if (have_lock != true) { + if (AskPackageKit()) + { + // let the PackageKit quit before retrying + sleep(2000); + continue; + } + if (show_continue_button) { symbol ret = Popup::AnyQuestion3( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/VERSION new/yast2-2.20.10/VERSION --- old/yast2-2.20.5/VERSION 2010-11-16 15:45:23.000000000 +0100 +++ new/yast2-2.20.10/VERSION 2011-01-04 14:42:45.000000000 +0100 @@ -1 +1 @@ -2.20.5 +2.20.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org