Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2013-04-03 13:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2013-01-22 18:16:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2013-04-03 13:09:52.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Mar 18 09:05:29 UTC 2013 - [email protected] + +- configure the network when adding remote add-ons via boot + parameter in DVD installation (bnc#809912) +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-add-on-2.23.1.tar.bz2 New: ---- yast2-add-on-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.xX1XUU/_old 2013-04-03 13:09:54.000000000 +0200 +++ /var/tmp/diff_new_pack.xX1XUU/_new 2013-04-03 13:09:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 2.23.1 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-add-on-2.23.1.tar.bz2 -> yast2-add-on-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.23.1/VERSION new/yast2-add-on-2.24.0/VERSION --- old/yast2-add-on-2.23.1/VERSION 2013-01-21 14:45:12.000000000 +0100 +++ new/yast2-add-on-2.24.0/VERSION 2013-03-26 12:33:06.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.23.1/configure new/yast2-add-on-2.24.0/configure --- old/yast2-add-on-2.23.1/configure 2013-01-21 14:57:13.000000000 +0100 +++ new/yast2-add-on-2.24.0/configure 2013-03-26 17:52:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-add-on 2.23.1. +# Generated by GNU Autoconf 2.69 for yast2-add-on 2.24.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on' PACKAGE_TARNAME='yast2-add-on' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-add-on 2.23.1' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-add-on 2.24.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-add-on 2.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on 2.23.1:";; + short | recursive ) echo "Configuration of yast2-add-on 2.24.0:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on configure 2.23.1 +yast2-add-on configure 2.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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.23.1, which was +It was created by yast2-add-on $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on' - VERSION='2.23.1' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.23.1" +VERSION="2.24.0" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3403,7 +3403,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.23.1, which was +This file was extended by yast2-add-on $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,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.23.1 +yast2-add-on config.status 2.24.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.23.1/configure.in new/yast2-add-on-2.24.0/configure.in --- old/yast2-add-on-2.23.1/configure.in 2013-01-21 14:57:10.000000000 +0100 +++ new/yast2-add-on-2.24.0/configure.in 2013-03-26 17:52:37.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-add-on, 2.23.1, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 2.24.0, 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.23.1" +VERSION="2.24.0" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.23.1/src/inst_add-on.ycp new/yast2-add-on-2.24.0/src/inst_add-on.ycp --- old/yast2-add-on-2.23.1/src/inst_add-on.ycp 2013-01-21 14:44:16.000000000 +0100 +++ new/yast2-add-on-2.24.0/src/inst_add-on.ycp 2013-03-26 12:33:06.000000000 +0100 @@ -24,6 +24,50 @@ include "add-on/add-on-workflow.ycp"; +/* + * Ask to user to configure network for installing remote addons. + * User is aske when there is a remote add-on found and the network + * is not running yet. + * + * @param addon_urls list of URLs + * @return symbol user input result (`next, `back or `abort) + */ +symbol NetworkSetupForAddons(list<string> addon_urls) +{ + // protocols locally available (no network needed) + const list<string> local_protocols = ["cd", "dvd", "hd"]; + + // is this CD/DVD/HDD installation? + if (contains(local_protocols, tolower(Linuxrc::InstallInf("InstMode")))) + { + // is there any remote addon requiring network setup? + boolean network_needed = false; + foreach(string url, addon_urls, + { + // is it a remote protocol? + if (!contains(local_protocols, tolower(URL::Parse(url)["scheme"]:""))) + { + network_needed = true; + break; + } + } + ); + + if (network_needed) + { + // check and setup network + symbol ret = (symbol) WFM::CallFunction("inst_network_check", []); + y2milestone ("inst_network_check ret: %1", ret); + + if (contains ([`back, `abort], ret)) { + return ret; + } + } + } + + return `next; +} + if (AddOnProduct::skip_add_ons) { y2milestone ("Skipping add-ons (as requested before)"); return `auto; @@ -49,6 +93,13 @@ // each add-on on a separate line string addons = String::Replace(addon_opt, ",", "\n"); + // network setup is needed for local media installation (e.g. DVD) with remote Add-ons + symbol ret = NetworkSetupForAddons(splitstring(addons, "\n")); + + if (contains ([`back, `abort], ret)) { + return ret; + } + SCR::Write(.target.string, tmp_file, addons); // import the add-ons from the temporary file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
