Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at Thu Aug 4 09:37:17 CEST 2011.
-------- --- yast2-add-on/yast2-add-on.changes 2011-06-28 11:49:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-add-on/yast2-add-on.changes 2011-08-03 16:06:54.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Aug 3 13:21:14 UTC 2011 - [email protected] + +- cleanup: removed obsoleted SourceManager::SyncAddedAndDeleted() + call (zmd sync has been removed) +- 2.21.4 + +------------------------------------------------------------------- +Fri Jul 22 13:28:42 UTC 2011 - [email protected] + +- properly remove an add-on from installation workflow when it + is not compliant (bnc#701497) +- 2.21.3 + +------------------------------------------------------------------- +Wed Jun 29 18:07:46 CEST 2011 - [email protected] + +- fixed relurl://.... for add-on config in autoyast XML + (bnc#702863) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-add-on-2.21.2.tar.bz2 New: ---- yast2-add-on-2.21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.eJgVTZ/_old 2011-08-04 09:36:29.000000000 +0200 +++ /var/tmp/diff_new_pack.eJgVTZ/_new 2011-08-04 09:36:29.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-add-on -Version: 2.21.2 +Version: 2.21.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.21.2.tar.bz2 +Source0: yast2-add-on-2.21.4.tar.bz2 Prefix: /usr @@ -61,7 +61,7 @@ This package contains YaST Add-On media installation code. %prep -%setup -n yast2-add-on-2.21.2 +%setup -n yast2-add-on-2.21.4 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-add-on-2.21.2.tar.bz2 -> yast2-add-on-2.21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.2/VERSION new/yast2-add-on-2.21.4/VERSION --- old/yast2-add-on-2.21.2/VERSION 2011-06-28 11:34:19.000000000 +0200 +++ new/yast2-add-on-2.21.4/VERSION 2011-08-03 15:22:19.000000000 +0200 @@ -1 +1 @@ -2.21.2 +2.21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.2/configure new/yast2-add-on-2.21.4/configure --- old/yast2-add-on-2.21.2/configure 2011-06-28 11:46:50.000000000 +0200 +++ new/yast2-add-on-2.21.4/configure 2011-08-03 16:06:25.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-add-on 2.21.2. +# Generated by GNU Autoconf 2.68 for yast2-add-on 2.21.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on' PACKAGE_TARNAME='yast2-add-on' -PACKAGE_VERSION='2.21.2' -PACKAGE_STRING='yast2-add-on 2.21.2' +PACKAGE_VERSION='2.21.4' +PACKAGE_STRING='yast2-add-on 2.21.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-add-on 2.21.2 to adapt to many kinds of systems. +\`configure' configures yast2-add-on 2.21.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on 2.21.2:";; + short | recursive ) echo "Configuration of yast2-add-on 2.21.4:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on configure 2.21.2 +yast2-add-on configure 2.21.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-add-on $as_me 2.21.2, which was +It was created by yast2-add-on $as_me 2.21.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on' - VERSION='2.21.2' + VERSION='2.21.4' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.2" +VERSION="2.21.4" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-add-on $as_me 2.21.2, which was +This file was extended by yast2-add-on $as_me 2.21.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,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-add-on config.status 2.21.2 +yast2-add-on config.status 2.21.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.2/configure.in new/yast2-add-on-2.21.4/configure.in --- old/yast2-add-on-2.21.2/configure.in 2011-06-28 11:46:47.000000000 +0200 +++ new/yast2-add-on-2.21.4/configure.in 2011-08-03 16:06:23.000000000 +0200 @@ -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-add-on, 2.21.2, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 2.21.4, http://bugs.opensuse.org/, yast2-add-on) 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.21.2" +VERSION="2.21.4" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.2/src/add-on-workflow.ycp new/yast2-add-on-2.21.4/src/add-on-workflow.ycp --- old/yast2-add-on-2.21.2/src/add-on-workflow.ycp 2011-06-28 11:35:32.000000000 +0200 +++ new/yast2-add-on-2.21.4/src/add-on-workflow.ycp 2011-08-03 15:14:47.000000000 +0200 @@ -1017,6 +1017,22 @@ AddOnProduct::PrepareForRegistration (AddOnProduct::src_id); some_addon_changed = true; } + else if (ret == `abort || ret == `cancel) + { + y2milestone("Add-on sequence aborted"); + + if (AddOnProduct::src_id != nil) + { + y2milestone("Removing add-on repository: %1", AddOnProduct::src_id); + + // remove the repository + Pkg::SourceDelete(AddOnProduct::src_id); + + AddOnProduct::add_on_products = filter(map<string,any> add_on_product, AddOnProduct::add_on_products, + {return add_on_product["media"]:-1 != AddOnProduct::src_id;} + ); + } + } Redraw (enable_back, enable_next, enable_abort, back_button, next_button, abort_button); @@ -1517,21 +1533,6 @@ } void RunAddProductWorkflow () { - // feedback heading - string heading = _("Add-On Product Installation"); - // feedback message - string message - = _("Reading packages available at the installation repositories..."); - - Popup::ShowFeedback (heading, message); - - y2milestone ("syncing srcid %1 to zmd", AddOnProduct::src_id); - boolean synced - = SourceManager::SyncAddedAndDeleted ([AddOnProduct::src_id], []); - y2milestone ("sync status: %1", synced); - - Popup::ClearFeedback (); - WFM::CallFunction ("inst_addon_update_sources", []); AddOnProduct::DoInstall(); // Write only when there are some changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.2/src/add-on_auto.ycp new/yast2-add-on-2.21.4/src/add-on_auto.ycp --- old/yast2-add-on-2.21.2/src/add-on_auto.ycp 2011-06-14 12:35:42.000000000 +0200 +++ new/yast2-add-on-2.21.4/src/add-on_auto.ycp 2011-07-01 13:29:53.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: add-on_auto.ycp 64211 2011-06-03 13:44:33Z locilka $ + * $Id: add-on_auto.ycp 64699 2011-07-01 11:29:52Z lslezak $ * */ { @@ -28,6 +28,7 @@ import "AutoinstGeneral"; import "PackageLock"; import "Installation"; +import "String"; include "add-on/add-on-workflow.ycp"; @@ -161,6 +162,14 @@ AddOnProduct::add_on_products = maplist (map <string, any> prod, AddOnProduct::add_on_products, { string media = prod["media_url"]:""; string pth = prod["product_dir"]:"/"; + + if (String::StartsWith(media, "relurl://")) + { + string base = AddOnProduct::GetBaseProductURL(); + media = AddOnProduct::GetAbsoluteURL( base, media ); + y2milestone("relurl changed to %1", media); + } + sources[media] = sources[media]:$[]; // set addon specific sig-handling ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
