Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory
checked in at 2013-08-12 14:26:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old)
and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes
2013-08-01 11:07:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes
2013-08-12 14:26:37.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 5 13:40:42 CEST 2013 - jsuch...@suse.cz
+
+- check the product profile of new add-on product (backport of
+ fate#310730)
+- 3.0.1
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-3.0.0.tar.bz2
New:
----
yast2-add-on-3.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.eKND7A/_old 2013-08-12 14:26:38.000000000 +0200
+++ /var/tmp/diff_new_pack.eKND7A/_new 2013-08-12 14:26:38.000000000 +0200
@@ -17,15 +17,15 @@
Name: yast2-add-on
-Version: 3.0.0
+Version: 3.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-add-on-%{version}.tar.bz2
Requires: autoyast2-installation
-# Kernel::InformAboutKernelChange
-Requires: yast2 >= 2.23.8
+# ProductProfile
+Requires: yast2 >= 3.0.1
Requires: yast2-country
Requires: yast2-installation
@@ -35,7 +35,7 @@
Requires: yast2-storage >= 2.16.1
BuildRequires: update-desktop-files
-BuildRequires: yast2 >= 2.23.8
+BuildRequires: yast2 >= 3.0.1
BuildRequires: yast2-devtools
# splitted from yast2-installation
++++++ yast2-add-on-3.0.0.tar.bz2 -> yast2-add-on-3.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.0.0/Makefile.am.common
new/yast2-add-on-3.0.1/Makefile.am.common
--- old/yast2-add-on-3.0.0/Makefile.am.common 2013-07-31 11:10:30.000000000
+0200
+++ new/yast2-add-on-3.0.1/Makefile.am.common 2013-08-07 17:21:15.000000000
+0200
@@ -30,10 +30,10 @@
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(filter %.ycp,client_DATA)"; then \
+check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA)
$(ycpchook) $(ybcfiles)
+ @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \
if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
+ TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \
echo "Checking syntax of $${TO_CHECK}"; \
if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
@@ -42,6 +42,20 @@
else \
echo "Syntax check disabled"; \
fi; \
+ fi
+ @if test "$(filter %.rb, $^)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.rb, $^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ for f in $${TO_CHECK}; do \
+ if ! ruby -c $$f > /dev/null; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
+ exit 1; \
+ fi; \
+ done; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
fi
-include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.0.0/VERSION
new/yast2-add-on-3.0.1/VERSION
--- old/yast2-add-on-3.0.0/VERSION 2013-07-31 11:10:23.000000000 +0200
+++ new/yast2-add-on-3.0.1/VERSION 2013-08-05 14:16:45.000000000 +0200
@@ -1 +1 @@
-3.0.0
+3.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.0.0/configure
new/yast2-add-on-3.0.1/configure
--- old/yast2-add-on-3.0.0/configure 2013-07-31 11:10:33.000000000 +0200
+++ new/yast2-add-on-3.0.1/configure 2013-08-07 17:21:18.000000000 +0200
@@ -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 3.0.0.
+# Generated by GNU Autoconf 2.69 for yast2-add-on 3.0.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='3.0.0'
-PACKAGE_STRING='yast2-add-on 3.0.0'
+PACKAGE_VERSION='3.0.1'
+PACKAGE_STRING='yast2-add-on 3.0.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 3.0.0 to adapt to many kinds of systems.
+\`configure' configures yast2-add-on 3.0.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 3.0.0:";;
+ short | recursive ) echo "Configuration of yast2-add-on 3.0.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 3.0.0
+yast2-add-on configure 3.0.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 3.0.0, which was
+It was created by yast2-add-on $as_me 3.0.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='3.0.0'
+ VERSION='3.0.1'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="3.0.0"
+VERSION="3.0.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 3.0.0, which was
+This file was extended by yast2-add-on $as_me 3.0.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 3.0.0
+yast2-add-on config.status 3.0.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-3.0.0/configure.ac
new/yast2-add-on-3.0.1/configure.ac
--- old/yast2-add-on-3.0.0/configure.ac 2013-07-31 11:10:30.000000000 +0200
+++ new/yast2-add-on-3.0.1/configure.ac 2013-08-07 17:21:15.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-add-on
dnl
-dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-add-on, 3.0.0, http://bugs.opensuse.org/, yast2-add-on)
+AC_INIT(yast2-add-on, 3.0.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="3.0.0"
+VERSION="3.0.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-3.0.0/src/Makefile.in
new/yast2-add-on-3.0.1/src/Makefile.in
--- old/yast2-add-on-3.0.0/src/Makefile.in 2013-07-31 11:10:34.000000000
+0200
+++ new/yast2-add-on-3.0.1/src/Makefile.in 2013-08-07 17:21:19.000000000
+0200
@@ -579,10 +579,10 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(filter %.ycp,client_DATA)"; then \
+check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA)
$(ycpchook) $(ybcfiles)
+ @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \
if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
+ TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \
echo "Checking syntax of $${TO_CHECK}"; \
if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
@@ -591,6 +591,20 @@
else \
echo "Syntax check disabled"; \
fi; \
+ fi
+ @if test "$(filter %.rb, $^)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.rb, $^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ for f in $${TO_CHECK}; do \
+ if ! ruby -c $$f > /dev/null; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your
own risk"; \
+ exit 1; \
+ fi; \
+ done; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
fi
-include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-add-on-3.0.0/src/include/add-on/add-on-workflow.rb
new/yast2-add-on-3.0.1/src/include/add-on/add-on-workflow.rb
--- old/yast2-add-on-3.0.0/src/include/add-on/add-on-workflow.rb
2013-07-30 13:20:46.000000000 +0200
+++ new/yast2-add-on-3.0.1/src/include/add-on/add-on-workflow.rb
2013-08-05 14:16:45.000000000 +0200
@@ -31,6 +31,7 @@
Yast.import "Sequencer"
Yast.import "SourceManager"
Yast.import "PackageSystem"
+ Yast.import "ProductProfile"
Yast.import "SuSEFirewall"
Yast.import "Stage"
Yast.import "Wizard"
@@ -827,23 +828,29 @@
ret
end
+ # Check new product compliance; may abort the installation
+ def CheckCompliance
+ if ProductProfile.CheckCompliance(AddOnProduct.src_id)
+ return :next
+ else
+ return :abort
+ end
+ end
+
def RunWizard
aliases = {
- "media" => lambda { MediaSelect() },
- # "catalog" : ``(CatalogSelect ()),
- # "product" : ``(ProductSelect ()),
- "install_product" => lambda(
- ) do
- InstallProduct()
- end
+ "media" => lambda { MediaSelect() },
+ "install_product" => lambda { InstallProduct() },
+ "check_compliance" => lambda { CheckCompliance() }
}
+
sequence = {
"ws_start" => "media",
"media" => {
:abort => :abort,
- :next => "install_product",
- :finish => "install_product"
+ :next => "check_compliance",
+ :finish => "check_compliance"
},
# "catalog" : $[
# `abort : `abort,
@@ -855,6 +862,10 @@
# `next : `next,
# `finish : `next,
# ],
+ "check_compliance" => {
+ :abort => :abort,
+ :next => "install_product"
+ },
"install_product" => {
:abort => :abort,
:next => :next,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
