Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at 2013-04-05 07:24:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2", Maintainer is "f...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-02-20
09:26:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-04-05
07:24:24.000000000 +0200
@@ -1,0 +2,18 @@
+Mon Mar 25 11:35:59 CET 2013 - f...@suse.de
+
+- prevent kill of autoyast-initscripts.service by systemd
+ (fix is by joschibrauc...@gmx.de, bnc#803577)
+
+-------------------------------------------------------------------
+Fri Mar 15 09:31:37 UTC 2013 - jsr...@suse.cz
+
+- fixed handling of removing (or deselecting) packages during
+ AutoYaST upgrade (bnc#794403)
+
+-------------------------------------------------------------------
+Thu Mar 14 15:08:47 CET 2013 - f...@suse.de
+
+- 2.24.0
+- add possibility to demand swap suited for suspend (bnc#801866)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.23.5.tar.bz2
New:
----
autoyast2-2.24.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.aqE4HI/_old 2013-04-05 07:27:08.000000000 +0200
+++ /var/tmp/diff_new_pack.aqE4HI/_new 2013-04-05 07:27:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 2.23.5
+Version: 2.24.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,8 +81,6 @@
installation sources.
%package installation
-Version: 2.23.5
-Release: 0
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
# API for Disabled Modules (ProductControl)
++++++ autoyast2-2.23.5.tar.bz2 -> autoyast2-2.24.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/VERSION new/autoyast2-2.24.0/VERSION
--- old/autoyast2-2.23.5/VERSION 2013-02-19 18:51:32.000000000 +0100
+++ new/autoyast2-2.24.0/VERSION 2013-03-14 18:14:49.000000000 +0100
@@ -1 +1 @@
-2.23.5
+2.24.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/configure
new/autoyast2-2.24.0/configure
--- old/autoyast2-2.23.5/configure 2013-02-19 18:51:46.000000000 +0100
+++ new/autoyast2-2.24.0/configure 2013-03-27 14:46:45.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for autoyast2 2.23.5.
+# Generated by GNU Autoconf 2.69 for autoyast2 2.24.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.23.5'
-PACKAGE_STRING='autoyast2 2.23.5'
+PACKAGE_VERSION='2.24.0'
+PACKAGE_STRING='autoyast2 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 autoyast2 2.23.5 to adapt to many kinds of systems.
+\`configure' configures autoyast2 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 autoyast2 2.23.5:";;
+ short | recursive ) echo "Configuration of autoyast2 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
-autoyast2 configure 2.23.5
+autoyast2 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 autoyast2 $as_me 2.23.5, which was
+It was created by autoyast2 $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='autoyast2'
- VERSION='2.23.5'
+ VERSION='2.24.0'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="2.23.5"
+VERSION="2.24.0"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr <f...@suse.de>"
@@ -3407,7 +3407,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.23.5, which was
+This file was extended by autoyast2 $as_me 2.24.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3460,7 +3460,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-autoyast2 config.status 2.23.5
+autoyast2 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/autoyast2-2.23.5/configure.in
new/autoyast2-2.24.0/configure.in
--- old/autoyast2-2.23.5/configure.in 2013-02-19 18:51:41.000000000 +0100
+++ new/autoyast2-2.24.0/configure.in 2013-03-27 14:46:42.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(autoyast2, 2.23.5, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.24.0, http://bugs.opensuse.org/, autoyast2)
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.5"
+VERSION="2.24.0"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr <f...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/autoyast2-2.23.5/scripts/autoyast-initscripts.service
new/autoyast2-2.24.0/scripts/autoyast-initscripts.service
--- old/autoyast2-2.23.5/scripts/autoyast-initscripts.service 2013-01-22
13:34:22.000000000 +0100
+++ new/autoyast2-2.24.0/scripts/autoyast-initscripts.service 2013-03-25
11:41:32.000000000 +0100
@@ -4,12 +4,11 @@
[Service]
Type=oneshot
-Environment=SYSTEMD_NO_WRAP=1 TERM=linux
+Environment=TERM=linux
ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/bin/autoyast-initscripts.sh
RemainAfterExit=yes
TimeoutSec=0
-StandardInput=tty
[Install]
WantedBy=default.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/src/clients/inst_autosetup.ycp
new/autoyast2-2.24.0/src/clients/inst_autosetup.ycp
--- old/autoyast2-2.23.5/src/clients/inst_autosetup.ycp 2013-02-19
14:21:30.000000000 +0100
+++ new/autoyast2-2.24.0/src/clients/inst_autosetup.ycp 2013-03-18
12:16:31.000000000 +0100
@@ -77,7 +77,7 @@
[
_("Configuring general settings..."),
_("Executing pre-install user scripts..."),
- _("Setting up language"),
+ _("Setting up language..."),
_("Creating partition plans..."),
_("Configuring Software selections..."),
_("Configuring Bootloader..."),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/autoyast2-2.23.5/src/clients/inst_autosetup_upgrade.ycp
new/autoyast2-2.24.0/src/clients/inst_autosetup_upgrade.ycp
--- old/autoyast2-2.23.5/src/clients/inst_autosetup_upgrade.ycp 2013-01-22
13:34:22.000000000 +0100
+++ new/autoyast2-2.24.0/src/clients/inst_autosetup_upgrade.ycp 2013-03-15
15:01:34.000000000 +0100
@@ -348,20 +348,48 @@
// this is new, (de)select stuff from the profile
list<string> packages = Profile::current["software","packages"]:[];
list<string> patterns = Profile::current["software","patterns"]:[];
+ list<string> products = Profile::current["software","products"]:[];
list<string> remove_packages =
Profile::current["software","remove-packages"]:[];
list<string> remove_patterns =
Profile::current["software","remove-patterns"]:[];
+ list<string> remove_products =
Profile::current["software","remove-products"]:[];
+ // neutralize first, otherwise the change may have no effect
+ foreach (string p, remove_patterns, {
+ Pkg::ResolvableNeutral (p, `pattern, true);
+ });
+ foreach (string p, remove_packages, {
+ Pkg::ResolvableNeutral (p, `package, true);
+ });
+ foreach (string p, remove_products, {
+ Pkg::ResolvableNeutral (p, `product, true);
+ });
+ foreach (string p, patterns, {
+ Pkg::ResolvableNeutral (p, `pattern, true);
+ });
+ foreach (string p, packages, {
+ Pkg::ResolvableNeutral (p, `package, true);
+ });
+ foreach (string p, products, {
+ Pkg::ResolvableNeutral (p, `product, true);
+ });
+ // now set the final status
foreach (string p, remove_patterns, {
Pkg::ResolvableRemove (p, `pattern);
});
foreach (string p, remove_packages, {
Pkg::ResolvableRemove (p, `package);
});
+ foreach (string p, remove_products, {
+ Pkg::ResolvableRemove (p, `product);
+ });
foreach (string p, patterns, {
Pkg::ResolvableInstall (p, `pattern);
});
foreach (string p, packages, {
Pkg::ResolvableInstall (p, `package);
});
+ foreach (string p, products, {
+ Pkg::ResolvableInstall (p, `product);
+ });
// old stuff again here
if (Pkg::PkgSolve (!Update::onlyUpdateInstalled))
Update::solve_errors = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/autoyast2-2.23.5/src/clients/inst_store_upgrade_software.ycp
new/autoyast2-2.24.0/src/clients/inst_store_upgrade_software.ycp
--- old/autoyast2-2.23.5/src/clients/inst_store_upgrade_software.ycp
2013-01-22 13:34:22.000000000 +0100
+++ new/autoyast2-2.24.0/src/clients/inst_store_upgrade_software.ycp
2013-03-15 15:01:34.000000000 +0100
@@ -13,6 +13,9 @@
return p["transact_by"]:nil == `user || p["transact_by"]:nil ==
`app_high;
});
+ // note: does not matter if it is installed or to be installed, the
resulting
+ // state is the same; similar for uninstallation (valid for all packages,
patterns
+ // and products
list<string> patterns_to_remove = [];
list<string> patterns_to_install = maplist (map<string,any> p, patterns, {
if (p["status"]:nil == `selected || p["status"]:nil == `installed)
@@ -47,11 +50,33 @@
y2milestone ("Packages to install: %1", packages_to_install);
y2milestone ("Packages to remove: %1", packages_to_remove);
+ // find out status of products
+ list<map<string,any> > products = Pkg::ResolvableProperties ("", `product,
"");
+ products = filter (map<string,any> p, products, {
+ return p["transact_by"]:nil == `user || p["transact_by"]:nil ==
`app_high;
+ });
+
+ list<string> products_to_remove = [];
+ list<string> products_to_install = maplist (map<string,any> p, products, {
+ if (p["status"]:nil == `selected || p["status"]:nil == `installed)
+ return p["name"]:"";
+ else if (p["status"]:nil == `removed || p["status"]:nil == `available)
+ products_to_remove = add (products_to_remove, p["name"]:"");
+ return nil;
+ });
+ products_to_install = filter (string p, products_to_install, {
+ return p != nil;
+ });
+ y2milestone ("Products to install: %1", products_to_install);
+ y2milestone ("Products to remove: %1", products_to_remove);
+
map software = $[
"packages": packages_to_install,
"patterns": patterns_to_install,
+ "products": products_to_install,
"remove-packages": packages_to_remove,
"remove-patterns": patterns_to_remove,
+ "remove-products": products_to_remove,
];
Profile::current["software"] = software;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/src/include/autopart.ycp
new/autoyast2-2.24.0/src/include/autopart.ycp
--- old/autoyast2-2.23.5/src/include/autopart.ycp 2013-02-05
15:11:31.000000000 +0100
+++ new/autoyast2-2.24.0/src/include/autopart.ycp 2013-03-14
18:14:49.000000000 +0100
@@ -167,6 +167,10 @@
{
partition["size"] = -1;
}
+ else if( tolower(s) == "suspend" )
+ {
+ partition["size"] = -2;
+ }
else if( tolower(s) == "max" )
{
partition["size"] = 0;
@@ -177,9 +181,9 @@
}
}
- if( partition["size"]:0 == -1 && partition["mount"]:"" ==
"swap" )
+ if( partition["size"]:0<=-1 && partition["mount"]:"" == "swap"
)
{
- partition["size"] = 1024*1024*Partitions::SwapSizeMb(0);
+ partition["size"] =
1024*1024*Partitions::SwapSizeMb(0,(partition["size"]:0==-2));
}
if( partition["mount"]:"" == Partitions::BootMount() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/src/modules/AutoinstLVM.ycp
new/autoyast2-2.24.0/src/modules/AutoinstLVM.ycp
--- old/autoyast2-2.23.5/src/modules/AutoinstLVM.ycp 2013-01-22
13:34:22.000000000 +0100
+++ new/autoyast2-2.24.0/src/modules/AutoinstLVM.ycp 2013-03-14
18:14:49.000000000 +0100
@@ -127,9 +127,11 @@
integer vgsize = targetMap[device,"size_k"]:0*1024;
- if (lvsize_str == "auto" && mount_point == "swap") {
+ if ((lvsize_str == "auto"||lvsize_str == "suspend") &&
+ mount_point == "swap") {
y2milestone("swap slot size: %1", vgsize/1024*1024 );
- lvsize =
1024*1024*Partitions::SwapSizeMb(vgsize/(1024*1024));
+ lvsize =
1024*1024*Partitions::SwapSizeMb(vgsize/(1024*1024),
+
(lvsize_str=="suspend"));
} else if (lvsize_str!= "") {
lvsize = AutoinstStorage::humanStringToByte( lvsize_str,
true );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/src/modules/AutoinstStorage.ycp
new/autoyast2-2.24.0/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.23.5/src/modules/AutoinstStorage.ycp 2013-01-22
13:34:22.000000000 +0100
+++ new/autoyast2-2.24.0/src/modules/AutoinstStorage.ycp 2013-03-14
18:14:49.000000000 +0100
@@ -623,8 +623,9 @@
settings = maplist( map d, settings, ``{
d["partitions"] = maplist(map pe, d["partitions"]:[], ``{
if( haskey( pe, "size" ) ) {
- if( pe["size"]:"" == "auto" && pe["mount"]:"" ==
"swap" )
- pe["size"] = sformat( "%1",
1024*1024*Partitions::SwapSizeMb(0) );
+ if( (pe["size"]:""=="auto"||pe["size"]:""=="suspend")
&&
+ pe["mount"]:"" == "swap" )
+ pe["size"] = sformat( "%1",
1024*1024*Partitions::SwapSizeMb(0,(pe["size"]:""=="suspend")) );
else if( pe["size"]:"" == "auto" && pe["mount"]:"" ==
"/boot" )
pe["size"] = sformat( "%1",
Partitions::MinimalNeededBootsize() );
if( pe["size"]:"" != "max" && pe["size"]:"" != "auto" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.5/src/schema/software.rnc
new/autoyast2-2.24.0/src/schema/software.rnc
--- old/autoyast2-2.23.5/src/schema/software.rnc 2013-01-22
13:34:22.000000000 +0100
+++ new/autoyast2-2.24.0/src/schema/software.rnc 2013-03-15
15:01:34.000000000 +0100
@@ -10,6 +10,9 @@
post-patterns? &
remove-packages? &
patterns? &
+ remove-patterns? &
+ products? &
+ remove-products? &
element do_online_update { BOOLEAN }? &
element instsource {text}?
}
@@ -39,3 +42,18 @@
LIST,
element package {text}+
}
+remove-patterns =
+ element remove-patterns {
+ LIST,
+ element pattern {text}+
+ }
+products =
+ element products {
+ LIST,
+ element product {text}+
+ }
+remove-products =
+ element remove-products {
+ LIST,
+ element product {text}+
+ }
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
