Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory
checked in at Mon Oct 3 09:27:40 CEST 2011.
--------
--- openSUSE:Factory/yast2-update/yast2-update.changes 2011-09-26 10:42:54.000000000 +0200
+++ yast2-update/yast2-update.changes 2011-09-23 16:59:24.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Sep 23 11:01:27 UTC 2011 - lslezak@suse.cz
+
+- code cleanup - removed obsoled code for handling selections
+ (replaced by patterns long time ago),
+ use Pkg::SourceProductData() instead of obsoleted
+ Pkg::SourceProduct()
+- 2.21.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-update-2.21.0.tar.bz2
New:
----
yast2-update-2.21.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.DFPaeJ/_old 2011-10-03 09:27:37.000000000 +0200
+++ /var/tmp/diff_new_pack.DFPaeJ/_new 2011-10-03 09:27:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.21.0)
+# spec file for package yast2-update
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -14,21 +14,22 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
# norootforbuild
+
Name: yast2-update
-Version: 2.21.0
+Version: 2.21.1
Release: 0
-
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.21.0.tar.bz2
+Source0: yast2-update-%{version}.tar.bz2
-prefix: /usr
+Prefix: /usr
Group: System/YaST
License: GPL v2 or later
-BuildRequires: perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
# FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12
# Packages::GetBaseSourceID
@@ -84,7 +85,7 @@
Use this component if you wish to update your system.
%prep
-%setup -n yast2-update-2.21.0
+%setup -n yast2-update-%{version}
%build
%{prefix}/bin/y2tool y2autoconf
@@ -108,7 +109,6 @@
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
-
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -140,3 +140,5 @@
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp
/usr/share/YaST2/clients/run_update.ycp
+
+%changelog
++++++ yast2-update-2.21.0.tar.bz2 -> yast2-update-2.21.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/VERSION new/yast2-update-2.21.1/VERSION
--- old/yast2-update-2.21.0/VERSION 2011-09-22 11:02:54.000000000 +0200
+++ new/yast2-update-2.21.1/VERSION 2011-09-23 16:56:36.000000000 +0200
@@ -1 +1 @@
-2.21.0
+2.21.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/configure new/yast2-update-2.21.1/configure
--- old/yast2-update-2.21.0/configure 2011-09-22 13:57:39.000000000 +0200
+++ new/yast2-update-2.21.1/configure 2011-09-23 16:58:55.000000000 +0200
@@ -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.0.
+# Generated by GNU Autoconf 2.68 for yast2-update 2.21.1.
#
# 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.0'
-PACKAGE_STRING='yast2-update 2.21.0'
+PACKAGE_VERSION='2.21.1'
+PACKAGE_STRING='yast2-update 2.21.1'
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.0 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.21.1 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.0:";;
+ short | recursive ) echo "Configuration of yast2-update 2.21.1:";;
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.0
+yast2-update configure 2.21.1
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.0, which was
+It was created by yast2-update $as_me 2.21.1, 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.0'
+ VERSION='2.21.1'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.0"
+VERSION="2.21.1"
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.0, which was
+This file was extended by yast2-update $as_me 2.21.1, 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.0
+yast2-update config.status 2.21.1
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.21.0/configure.in new/yast2-update-2.21.1/configure.in
--- old/yast2-update-2.21.0/configure.in 2011-09-22 13:57:35.000000000 +0200
+++ new/yast2-update-2.21.1/configure.in 2011-09-23 16:58:53.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.21.0, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.21.1, 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.0"
+VERSION="2.21.1"
RPMNAME="yast2-update"
MAINTAINER="Jiří Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/kernel-update-tool.pot new/yast2-update-2.21.1/kernel-update-tool.pot
--- old/yast2-update-2.21.0/kernel-update-tool.pot 2011-06-23 15:53:11.000000000 +0200
+++ new/yast2-update-2.21.1/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-23 15:53+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/clients/kernel-update.ycp:189
-msgid "Warning"
-msgstr ""
-
-#: src/clients/kernel-update.ycp:190
-msgid "Abort the kernel upgrade?"
-msgstr ""
-
-#: src/clients/kernel-update.ycp:247
-msgid "Alternate Download Location"
-msgstr ""
-
-#: src/clients/kernel-update.ycp:510
-msgid "Kernel Update Status Log"
-msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/src/clients/inst_update.ycp new/yast2-update-2.21.1/src/clients/inst_update.ycp
--- old/yast2-update-2.21.0/src/clients/inst_update.ycp 2009-12-18 14:52:33.000000000 +0100
+++ new/yast2-update-2.21.1/src/clients/inst_update.ycp 2011-09-23 13:02:18.000000000 +0200
@@ -9,7 +9,7 @@
* Show checkboxes for software categories. Let the user select his software.
* if he want to UPGRADE his system.
*
- * $Id: inst_update.ycp 47330 2008-05-06 16:49:50Z locilka $
+ * $Id: inst_update.ycp 65966 2011-09-23 11:02:17Z lslezak $
*/
{
@@ -25,35 +25,8 @@
// screen title for update options
string title = _("Update Options");
- // create box with base selections, check if current selection really is available
- term baseconfsbox = `VBox ();
-
- // loop through available base selections, create radio button entry for every base selection
- // preselect current selection
-
- list<string> base_configurations = [];
-
- if (Packages::using_patterns)
- {
- baseconfsbox = `PushButton (`id (`details), _("Select Patterns"));
- }
- else
- {
- // get available base selection sorted by reverse order (highest ordered base selection first)
- list<string> available_base_selections = Update::GetBaseSelections ();
- y2milestone ("available_base_selections %1, current_selection %2", available_base_selections, Update::selected_selection);
- foreach (string selection, available_base_selections, {
- map selection_data = Pkg::SelectionData (selection);
- string selection_summary = selection_data["summary"]:"";
- boolean preselect = (selection == Update::selected_selection);
- baseconfsbox = add (baseconfsbox, `Left(`RadioButton(`id(selection),
- `opt(`notify, `autoShortcut),
- selection_summary,
- preselect)));
- });
- baseconfsbox = `RadioButtonGroup(`id(`baseconf), baseconfsbox);
- base_configurations = available_base_selections;
- }
+ // push button label
+ term baseconfsbox = `PushButton (`id (`details), _("Select Patterns"));
// Checking: already selected addons or single selection?
@@ -157,12 +130,6 @@
UI::ChangeWidget(`id(`upgrade), `Value, !Update::onlyUpdateInstalled);
UI::ChangeWidget(`id(`notupgrade), `Value, Update::onlyUpdateInstalled);
- // grey out radio buttons if only already installed packages should be updated
-
- foreach (string sel, base_configurations, {
- UI::ChangeWidget(`id(sel), `Enabled, !Update::onlyUpdateInstalled);
- });
-
// UI::ChangeWidget(`id(`delete), `Value, Update::deleteOldPackages);
any ret = nil;
@@ -175,16 +142,6 @@
if (ret == `abort && Popup::ConfirmAbort (`painless))
break;
- if (ret == `upgrade || ret == `notupgrade)
- {
- boolean tmp = (boolean) UI::QueryWidget (`id(`upgrade), `Value);
- foreach (string sel, base_configurations, {
- UI::ChangeWidget(`id(sel), `Enabled, tmp);
- });
-
- continue;
- }
-
if (ret == `details)
{
@@ -205,20 +162,6 @@
if (UI::QueryWidget (`id(`notupgrade), `Value) != Update::onlyUpdateInstalled)
something_changed = true;
- if (Packages::using_patterns)
- {
- y2milestone ("Using patterns");
- }
- else
- {
- if ((boolean) UI::QueryWidget (`id(`upgrade), `Value) &&
- Update::selected_selection != UI::QueryWidget(`id(`baseconf), `CurrentButton))
- something_changed = true;
- }
-
-// if (UI::QueryWidget (`id(`delete), `Value ) != Update::deleteOldPackages)
-// something_changed = true;
-
if (something_changed && Packages::base_selection_modified)
{
// yes/no question
@@ -239,22 +182,9 @@
Update::onlyUpdateInstalled = (boolean) UI::QueryWidget (`id(`notupgrade), `Value);
// Update::deleteOldPackages = (boolean) UI::QueryWidget (`id(`delete), `Value);
- if (Packages::using_patterns)
+ if (b1 != Update::onlyUpdateInstalled || details_pressed)
{
- if (b1 != Update::onlyUpdateInstalled || details_pressed)
- {
- Update::manual_interaction = true;
- }
- }
- else
- {
- string s1 = Update::selected_selection;
- Update::selected_selection = (string) UI::QueryWidget(`id(`baseconf), `CurrentButton);
-
- if (b1 != Update::onlyUpdateInstalled || s1 != Update::selected_selection)
- {
- Update::manual_interaction = true;
- }
+ Update::manual_interaction = true;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-2.21.0/src/clients/update_proposal.ycp new/yast2-update-2.21.1/src/clients/update_proposal.ycp
--- old/yast2-update-2.21.0/src/clients/update_proposal.ycp 2010-02-08 08:07:48.000000000 +0100
+++ new/yast2-update-2.21.1/src/clients/update_proposal.ycp 2011-09-23 13:05:57.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 60593 2010-01-28 10:12:45Z locilka $
+ * $Id: update_proposal.ycp 65968 2011-09-23 11:05:56Z lslezak $
*/
{
textdomain "update";
@@ -192,12 +192,6 @@
{
Update::did_init1 = true;
- if (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0)
- {
- y2milestone ("No base selection found, but patterns found...");
- Packages::using_patterns = true;
- }
-
list<string> restore = [];
list