Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory
checked in at 2013-01-22 18:16:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 "lsle...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes
2012-10-31 07:04:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes
2013-01-22 18:16:40.000000000 +0100
@@ -1,0 +2,12 @@
+Sun Jan 20 15:41:50 UTC 2013 - lsle...@suse.cz
+
+- add the add-ons specified in the boot parameters (fate#314318)
+- 2.23.1
+
+-------------------------------------------------------------------
+Sun Jan 20 14:41:39 UTC 2013 - lsle...@suse.cz
+
+- added support for specifying add-on repo alias name (fate#313144)
+ (bnc#741529)
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-2.23.0.tar.bz2
New:
----
yast2-add-on-2.23.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.GPodOc/_old 2013-01-22 18:16:45.000000000 +0100
+++ /var/tmp/diff_new_pack.GPodOc/_new 2013-01-22 18:16:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-add-on
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 2.23.0
+Version: 2.23.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,8 +29,8 @@
Requires: yast2-country
Requires: yast2-installation
-# Packages::AdjustSourcePropertiesAccordingToProduct
-Requires: yast2-packager >= 2.18.4
+# AddOnProduct::SetRepoUrlAlias()
+Requires: yast2-packager >= 2.23.1
# bugzilla #335582, new API for StorageDevices
Requires: yast2-storage >= 2.16.1
++++++ yast2-add-on-2.23.0.tar.bz2 -> yast2-add-on-2.23.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-2.23.0/Makefile.in
new/yast2-add-on-2.23.1/Makefile.in
--- old/yast2-add-on-2.23.0/Makefile.in 2012-10-29 15:15:38.000000000 +0100
+++ new/yast2-add-on-2.23.1/Makefile.in 2013-01-21 14:57:14.000000000 +0100
@@ -684,7 +684,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-2.23.0/VERSION
new/yast2-add-on-2.23.1/VERSION
--- old/yast2-add-on-2.23.0/VERSION 2012-10-29 15:11:55.000000000 +0100
+++ new/yast2-add-on-2.23.1/VERSION 2013-01-21 14:45:12.000000000 +0100
@@ -1 +1 @@
-2.23.0
+2.23.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-2.23.0/configure
new/yast2-add-on-2.23.1/configure
--- old/yast2-add-on-2.23.0/configure 2012-10-29 15:15:38.000000000 +0100
+++ new/yast2-add-on-2.23.1/configure 2013-01-21 14:57:13.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.0.
+# Generated by GNU Autoconf 2.69 for yast2-add-on 2.23.1.
#
# 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.0'
-PACKAGE_STRING='yast2-add-on 2.23.0'
+PACKAGE_VERSION='2.23.1'
+PACKAGE_STRING='yast2-add-on 2.23.1'
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.0 to adapt to many kinds of systems.
+\`configure' configures yast2-add-on 2.23.1 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.0:";;
+ short | recursive ) echo "Configuration of yast2-add-on 2.23.1:";;
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.0
+yast2-add-on configure 2.23.1
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.0, which was
+It was created by yast2-add-on $as_me 2.23.1, 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.0'
+ VERSION='2.23.1'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="2.23.0"
+VERSION="2.23.1"
RPMNAME="yast2-add-on"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -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.0, which was
+This file was extended by yast2-add-on $as_me 2.23.1, 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.0
+yast2-add-on config.status 2.23.1
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.0/configure.in
new/yast2-add-on-2.23.1/configure.in
--- old/yast2-add-on-2.23.0/configure.in 2012-10-29 15:15:35.000000000
+0100
+++ new/yast2-add-on-2.23.1/configure.in 2013-01-21 14:57:10.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-add-on
dnl
-dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! --
+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.0, http://bugs.opensuse.org/, yast2-add-on)
+AC_INIT(yast2-add-on, 2.23.1, 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.0"
+VERSION="2.23.1"
RPMNAME="yast2-add-on"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-2.23.0/src/add-on.rnc
new/yast2-add-on-2.23.1/src/add-on.rnc
--- old/yast2-add-on-2.23.0/src/add-on.rnc 2012-10-29 15:08:05.000000000
+0100
+++ new/yast2-add-on-2.23.1/src/add-on.rnc 2013-01-21 14:36:56.000000000
+0100
@@ -9,6 +9,7 @@
media_url? &
product? &
name? &
+ alias? &
product_dir? &
ask_on_error? &
element signature-handling {
@@ -41,6 +42,7 @@
media_url = element media_url { text }
product = element product { text }
name = element name { text }
+alias = element alias { text }
product_dir = element product_dir { text }
ask_on_error = element ask_on_error { BOOLEAN }
add_on_products =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-2.23.0/src/add-on_auto.ycp
new/yast2-add-on-2.23.1/src/add-on_auto.ycp
--- old/yast2-add-on-2.23.0/src/add-on_auto.ycp 2012-10-29 15:08:05.000000000
+0100
+++ new/yast2-add-on-2.23.1/src/add-on_auto.ycp 2013-01-21 14:35:33.000000000
+0100
@@ -178,7 +178,9 @@
integer srcid = -1;
do {
- srcid = Pkg::SourceCreate (media, pth);
+ string url = AddOnProduct::SetRepoUrlAlias(media, prod["alias"]:"",
prod["name"]:"");
+
+ srcid = Pkg::SourceCreate(url, pth);
if ((srcid == -1 || srcid == nil) && !prod["ask_on_error"]:false) {
// error report
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-2.23.0/src/inst_add-on.ycp
new/yast2-add-on-2.23.1/src/inst_add-on.ycp
--- old/yast2-add-on-2.23.0/src/inst_add-on.ycp 2012-10-29 15:08:05.000000000
+0100
+++ new/yast2-add-on-2.23.1/src/inst_add-on.ycp 2013-01-21 14:44:16.000000000
+0100
@@ -18,6 +18,9 @@
import "Report";
import "Wizard";
import "Label";
+import "Installation";
+import "Linuxrc";
+import "String";
include "add-on/add-on-workflow.ycp";
@@ -32,6 +35,35 @@
PackageCallbacksInit::SetMediaCallbacks();
+// add add-ons specified on the kernel command line
+string addon_opt = Linuxrc::InstallInf("addon");
+
+// add the add-ons just once, skip adding if any add-on is
+// already present (handle going back and forth properly)
+if (addon_opt != nil && AddOnProduct::add_on_products == []) {
+ y2milestone("Specified extra add-ons via kernel cmdline");
+
+ // store the add-ons list into a temporary file
+ string tmp_dir = (string) SCR::Read(.target.tmpdir);
+ string tmp_file = tmp_dir + "/tmp_addon_list";
+ // each add-on on a separate line
+ string addons = String::Replace(addon_opt, ",", "\n");
+
+ SCR::Write(.target.string, tmp_file, addons);
+
+ // import the add-ons from the temporary file
+ AddOnProduct::AddPreselectedAddOnProducts([$["file" : tmp_file, "type" :
"plain"]]);
+
+ // remove the temporary file
+ SCR::Execute(.target.bash, sformat ("/bin/rm -rf '%1'",
String::Quote(tmp_file)));
+}
+
+// the module was started because of the kernel command line option
+// so finish it after adding the add-ons, no UI is actually needed
+if (Installation::add_on_selected == false) {
+ return `auto;
+}
+
symbol ret = RunAddOnMainDialog (
GetInstArgs::enable_back(), GetInstArgs::enable_next(), true,
Label::BackButton(), Label::NextButton(), Label::AbortButton(),
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
