Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2012-01-26 14:10:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-update (Old)
and /work/SRC/openSUSE:Factory/.yast2-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update", Maintainer is "jsuchome@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2011-11-16 17:23:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2012-01-26 14:10:03.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Jan 25 13:50:34 CET 2012 - jsuchome@suse.cz
+
+- confirmed license
+- 2.22.2
+
+-------------------------------------------------------------------
+Tue Jan 10 08:27:01 CET 2012 - jsuchome@suse.cz
+
+- during update proposal, check if desktop is really installed
+ (bnc#737402)
+- 2.22.1
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.22.0.tar.bz2
New:
----
yast2-update-2.22.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.kwFeCf/_old 2012-01-26 14:10:04.000000000 +0100
+++ /var/tmp/diff_new_pack.kwFeCf/_new 2012-01-26 14:10:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-update
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,18 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: yast2-update
-Version: 2.22.0
+Version: 2.22.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-update-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0+
+License: GPL-2.0
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
# FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12
@@ -93,7 +92,6 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
++++++ yast2-update-2.22.0.tar.bz2 -> yast2-update-2.22.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/VERSION new/yast2-update-2.22.2/VERSION
--- old/yast2-update-2.22.0/VERSION 2011-11-16 11:22:47.000000000 +0100
+++ new/yast2-update-2.22.2/VERSION 2012-01-25 13:50:46.000000000 +0100
@@ -1 +1 @@
-2.22.0
+2.22.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/configure new/yast2-update-2.22.2/configure
--- old/yast2-update-2.22.0/configure 2011-10-05 10:01:51.000000000 +0200
+++ new/yast2-update-2.22.2/configure 2012-01-25 13:50:51.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-update 2.21.1.
+# Generated by GNU Autoconf 2.68 for yast2-update 2.22.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.21.1'
-PACKAGE_STRING='yast2-update 2.21.1'
+PACKAGE_VERSION='2.22.2'
+PACKAGE_STRING='yast2-update 2.22.2'
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-update 2.21.1 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.22.2 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-update 2.21.1:";;
+ short | recursive ) echo "Configuration of yast2-update 2.22.2:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.21.1
+yast2-update configure 2.22.2
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-update $as_me 2.21.1, which was
+It was created by yast2-update $as_me 2.22.2, 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-update'
- VERSION='2.21.1'
+ VERSION='2.22.2'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.1"
+VERSION="2.22.2"
RPMNAME="yast2-update"
MAINTAINER="Jiří Suchomel "
@@ -3381,7 +3381,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-update $as_me 2.21.1, which was
+This file was extended by yast2-update $as_me 2.22.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3434,7 +3434,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-update config.status 2.21.1
+yast2-update config.status 2.22.2
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-update-2.22.0/configure.in new/yast2-update-2.22.2/configure.in
--- old/yast2-update-2.22.0/configure.in 2011-10-05 10:01:48.000000000 +0200
+++ new/yast2-update-2.22.2/configure.in 2012-01-25 13:50:48.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 2.21.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.21.1, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.22.2, http://bugs.opensuse.org/, yast2-update)
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.1"
+VERSION="2.22.2"
RPMNAME="yast2-update"
MAINTAINER="Jiří Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/backup_proposal.ycp new/yast2-update-2.22.2/src/clients/backup_proposal.ycp
--- old/yast2-update-2.22.0/src/clients/backup_proposal.ycp 2011-11-16 11:21:34.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/backup_proposal.ycp 2012-01-25 13:49:54.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: backup_proposal.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/inst_backup.ycp new/yast2-update-2.22.2/src/clients/inst_backup.ycp
--- old/yast2-update-2.22.0/src/clients/inst_backup.ycp 2011-11-16 11:21:34.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/inst_backup.ycp 2012-01-25 13:49:56.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: inst_backup.ycp
*
@@ -7,7 +27,7 @@
*
* Purpose: Ask the user for backups during the update.
*
- * $Id: inst_backup.ycp 46452 2008-04-11 16:43:06Z locilka $
+ * $Id: inst_backup.ycp 66814 2011-11-16 10:23:18Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/inst_rootpart.ycp new/yast2-update-2.22.2/src/clients/inst_rootpart.ycp
--- old/yast2-update-2.22.0/src/clients/inst_rootpart.ycp 2009-12-18 14:52:33.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/inst_rootpart.ycp 2012-01-25 13:49:58.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: inst_rootpart.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/inst_update.ycp new/yast2-update-2.22.2/src/clients/inst_update.ycp
--- old/yast2-update-2.22.0/src/clients/inst_update.ycp 2011-11-16 11:21:34.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/inst_update.ycp 2012-01-25 13:50:03.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: inst_update.ycp
*
@@ -9,7 +29,7 @@
* Show checkboxes for software categories. Let the user select his software.
* if he want to UPGRADE his system.
*
- * $Id: inst_update.ycp 65966 2011-09-23 11:02:17Z lslezak $
+ * $Id: inst_update.ycp 66814 2011-11-16 10:23:18Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/inst_update_partition.ycp new/yast2-update-2.22.2/src/clients/inst_update_partition.ycp
--- old/yast2-update-2.22.0/src/clients/inst_update_partition.ycp 2009-12-18 14:52:33.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/inst_update_partition.ycp 2012-01-25 13:50:01.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: inst_update_partition.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/inst_update_partition_auto.ycp new/yast2-update-2.22.2/src/clients/inst_update_partition_auto.ycp
--- old/yast2-update-2.22.0/src/clients/inst_update_partition_auto.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/inst_update_partition_auto.ycp 2012-01-25 13:50:00.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: inst_update_partition.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/packages_proposal.ycp new/yast2-update-2.22.2/src/clients/packages_proposal.ycp
--- old/yast2-update-2.22.0/src/clients/packages_proposal.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/packages_proposal.ycp 2012-01-25 13:50:07.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: packages_proposal.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/rootpart_check_keyboard.ycp new/yast2-update-2.22.2/src/clients/rootpart_check_keyboard.ycp
--- old/yast2-update-2.22.0/src/clients/rootpart_check_keyboard.ycp 2009-12-18 14:52:33.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/rootpart_check_keyboard.ycp 2012-01-25 13:50:09.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: rootpart_check_keyboard.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/rootpart_proposal.ycp new/yast2-update-2.22.2/src/clients/rootpart_proposal.ycp
--- old/yast2-update-2.22.0/src/clients/rootpart_proposal.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/rootpart_proposal.ycp 2012-01-25 13:50:11.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: rootpart_proposal.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/run_update.ycp new/yast2-update-2.22.2/src/clients/run_update.ycp
--- old/yast2-update-2.22.0/src/clients/run_update.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/run_update.ycp 2012-01-25 13:50:12.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* File: clients/update.ycp
* Module: System update
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/update.ycp new/yast2-update-2.22.2/src/clients/update.ycp
--- old/yast2-update-2.22.0/src/clients/update.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/update.ycp 2012-01-25 13:50:17.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* File: clients/update.ycp
* Module: System update
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/clients/update_proposal.ycp new/yast2-update-2.22.2/src/clients/update_proposal.ycp
--- old/yast2-update-2.22.0/src/clients/update_proposal.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/clients/update_proposal.ycp 2012-01-25 13:50:14.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: update_proposal.ycp
*
@@ -5,7 +25,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 65968 2011-09-23 11:05:56Z lslezak $
+ * $Id: update_proposal.ycp 66814 2011-11-16 10:23:18Z jsuchome $
*/
{
textdomain "update";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/include/rootpart.ycp new/yast2-update-2.22.2/src/include/rootpart.ycp
--- old/yast2-update-2.22.0/src/include/rootpart.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/include/rootpart.ycp 2012-01-25 13:50:19.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: include/installation/rootpart.ycp
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/modules/RootPart.ycp new/yast2-update-2.22.2/src/modules/RootPart.ycp
--- old/yast2-update-2.22.0/src/modules/RootPart.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/modules/RootPart.ycp 2012-01-25 13:50:21.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: RootPart.ycp
*
@@ -6,7 +26,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 64707 2011-07-01 13:15:22Z locilka $
+ * $Id: RootPart.ycp 66814 2011-11-16 10:23:18Z jsuchome $
*/
{
module "RootPart";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.22.0/src/modules/Update.ycp new/yast2-update-2.22.2/src/modules/Update.ycp
--- old/yast2-update-2.22.0/src/modules/Update.ycp 2011-11-16 11:21:35.000000000 +0100
+++ new/yast2-update-2.22.2/src/modules/Update.ycp 2012-01-25 13:50:23.000000000 +0100
@@ -1,3 +1,23 @@
+/* ------------------------------------------------------------------------------
+ * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may find
+ * current contact information at www.novell.com.
+ * ------------------------------------------------------------------------------
+ */
+
/**
* Module: Update.ycp
*
@@ -7,7 +27,7 @@
*
* Purpose: Update module
*
- * $Id: Update.ycp 66018 2011-09-23 14:58:39Z lslezak $
+ * $Id: Update.ycp 67134 2012-01-10 07:28:08Z jsuchome $
*/
{
module "Update";
@@ -624,10 +644,41 @@
return ret;
}
+ // check if given package is installed in the system selected for update
+ // (currently mounted under /mnt)
+ boolean PackageInstalled (string package)
+ {
+ return SCR::Execute (.target.bash, sformat ("rpm -q %1 --root /mnt", package)) == 0;
+ }
+
global void SetDesktopPattern() {
- string desktop = ReadInstalledDesktop();
- if (desktop == "kde" || desktop == "gnome")
+
+ string desktop = ReadInstalledDesktop();
+ if (contains (["kde", "kde4", "xfce", "lxde", "gnome", "startkde", "startkde4"], desktop))
{
+ // 'gnome'/'startkde' could be default values even if not installed,
+ // check the real state (bnc#737402)
+ if (desktop == "gnome")
+ {
+ if (!PackageInstalled ("gnome-session"))
+ {
+ y2milestone ("GNOME not present: not installing new desktop");
+ return;
+ }
+ }
+ else if (desktop == "startkde" || desktop == "startkde4")
+ {
+ if (PackageInstalled ("kdebase3-session") || PackageInstalled ("kdebase4-session"))
+ {
+ desktop = "kde4";
+ }
+ else
+ {
+ y2milestone ("KDE not present: not installing new desktop");
+ return;
+ }
+ }
+
y2milestone ("Selecting pattern to install: %1", desktop);
Pkg::ResolvableInstall (desktop, `pattern);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org