Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Fri Nov 5 17:23:40 CET 2010. -------- --- yast2/yast2.changes 2010-10-18 17:16:38.000000000 +0200 +++ yast2/yast2.changes 2010-11-05 14:02:05.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 5 12:40:03 UTC 2010 - lslezak@suse.cz + +- PackageCallbacks: removed the retry/abort/skip dialog from + DoneProvide callback - the user is asked via MediaChange + callback, don't ask twice when aborting. +- 2.20.3 + +------------------------------------------------------------------- +Tue Nov 2 15:09:00 UTC 2010 - lslezak@suse.cz + +- updated to match the changed StartPackage callback signature +- 2.20.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.20.1.tar.bz2 New: ---- yast2-2.20.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.vIwY4j/_old 2010-11-05 17:23:03.000000000 +0100 +++ /var/tmp/diff_new_pack.vIwY4j/_new 2010-11-05 17:23:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.20.1) +# spec file for package yast2 (Version 2.20.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.20.1 +Version: 2.20.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.20.1.tar.bz2 +Source0: yast2-2.20.3.tar.bz2 Prefix: /usr @@ -33,7 +33,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite # Needed already in build time -BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.17.32 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -44,8 +44,8 @@ # new UI::OpenContextMenu Requires: yast2-ycp-ui-bindings >= 2.18.4 -# Pkg::Get(Set)SolverFlags() -Requires: yast2-pkg-bindings >= 2.17.32 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 Requires: yast2_ui yast2-branding # For Cron Agent, Module Requires: perl-Config-Crontab @@ -128,7 +128,7 @@ installation with YaST2. %prep -%setup -n yast2-2.20.1 +%setup -n yast2-2.20.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.20.1.tar.bz2 -> yast2-2.20.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.1/VERSION new/yast2-2.20.3/VERSION --- old/yast2-2.20.1/VERSION 2010-10-18 17:06:49.000000000 +0200 +++ new/yast2-2.20.3/VERSION 2010-11-05 13:58:43.000000000 +0100 @@ -1 +1 @@ -2.20.1 +2.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.1/configure new/yast2-2.20.3/configure --- old/yast2-2.20.1/configure 2010-10-18 17:11:35.000000000 +0200 +++ new/yast2-2.20.3/configure 2010-11-05 14:00:55.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for yast2 2.20.1. +# Generated by GNU Autoconf 2.67 for yast2 2.20.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.20.1' -PACKAGE_STRING='yast2 2.20.1' +PACKAGE_VERSION='2.20.3' +PACKAGE_STRING='yast2 2.20.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1224,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.1 to adapt to many kinds of systems. +\`configure' configures yast2 2.20.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1295,7 +1295,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.20.1:";; + short | recursive ) echo "Configuration of yast2 2.20.3:";; esac cat <<\_ACEOF @@ -1375,7 +1375,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.20.1 +yast2 configure 2.20.3 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1392,7 +1392,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 $as_me 2.20.1, which was +It was created by yast2 $as_me 2.20.3, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2322,7 +2322,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.20.1' + VERSION='2.20.3' cat >>confdefs.h <<_ACEOF @@ -2444,7 +2444,7 @@ -VERSION="2.20.1" +VERSION="2.20.3" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -3478,7 +3478,7 @@ # 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.1, which was +This file was extended by yast2 $as_me 2.20.3, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3531,7 +3531,7 @@ 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.1 +yast2 config.status 2.20.3 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.1/configure.in new/yast2-2.20.3/configure.in --- old/yast2-2.20.1/configure.in 2010-10-18 17:11:31.000000000 +0200 +++ new/yast2-2.20.3/configure.in 2010-11-05 14:00:51.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.1, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.20.3, 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.1" +VERSION="2.20.3" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.1/library/modules/Version.ycp new/yast2-2.20.3/library/modules/Version.ycp --- old/yast2-2.20.1/library/modules/Version.ycp 2010-10-18 17:11:44.000000000 +0200 +++ new/yast2-2.20.3/library/modules/Version.ycp 2010-11-05 14:01:04.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.20.1"; +global string yast2 = "2.20.3"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.1/library/packages/src/PackageCallbacks.ycp new/yast2-2.20.3/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.20.1/library/packages/src/PackageCallbacks.ycp 2010-10-18 17:11:27.000000000 +0200 +++ new/yast2-2.20.3/library/packages/src/PackageCallbacks.ycp 2010-11-05 14:00:45.000000000 +0100 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 62648 2010-10-18 15:11:25Z lslezak $ + * $Id: PackageCallbacks.ycp 62754 2010-11-05 13:00:44Z lslezak $ * */ @@ -318,141 +318,9 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (provide_aborted) - { - provide_aborted = false; - return "C"; - } - if (error != 0) { - // this is for error code 1 ("NOT_FOUND"), %1 is name of a package - string message = sformat (_("Package %1 was not found on the medium."), name); - - // "IO" - if (error == 2) - { - // error message, %1 is a package name - message = sformat(_("Package %1 could not be downloaded (input/output error)."), name); - } - // "INVALID" - else if (error == 3) - { - // error message, %1 is a package name - 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 "C"; } return "I"; @@ -475,23 +343,13 @@ /** * At start of package install. */ - global void StartPackage (string name, string summary, integer + global void StartPackage (string name, string location, string summary, integer installsize, boolean is_delete) { if (!enable_asterix_package) return; - list<string> parsed_path = splitstring(name, "/"); - - if (size(parsed_path) > 0) - { - _package_name = parsed_path[size(parsed_path) - 1]:""; - } - else - { - _package_name = name; - } - + _package_name = name; _package_size = installsize; _deleting_package = is_delete; string sz = String::FormatSizeWithPrecision (installsize, 2, false); @@ -2973,7 +2831,7 @@ string DummyDoneProvide (integer error, string reason, string name) {y2debug("Empty DoneProvide callback, returning 'I'");return "I";} -void DummyStartPackage (string name, string summary, integer installsize, boolean is_delete) {y2debug("Empty StartPackage callback");} +void DummyStartPackage (string name, string location, string summary, integer installsize, boolean is_delete) {y2debug("Empty StartPackage callback");} string DummyDonePackage (integer error, string reason) {y2debug("Empty DonePackage callback, returning 'I'");return "I";} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org