Hello community,
here is the log from the commit of package yast2-update
checked in at Fri May 18 19:06:04 CEST 2007.
--------
--- yast2-update/yast2-update.changes 2007-05-03 16:42:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-05-18 16:34:25.000000000 +0200
@@ -1,0 +2,12 @@
+Thu May 17 22:40:09 CEST 2007 - locilka@suse.cz
+
+- System Update icon is back in Control Center (#274064)
+- System Update functionality is allowed only when product versions
+ are matching (can have a different name). Non-matching product
+ means no possibility for System Update.
+- Warning is printed when versions match but product names are
+ different (#274064).
+- System Update temporarily renamed to 'FACTORY Update'.
+- 2.15.12
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.15.11.tar.bz2
New:
----
yast2-update-2.15.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.i14487/_old 2007-05-18 19:05:39.000000000 +0200
+++ /var/tmp/diff_new_pack.i14487/_new 2007-05-18 19:05:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.15.11)
+# spec file for package yast2-update (Version 2.15.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,14 +11,14 @@
# norootforbuild
Name: yast2-update
-Version: 2.15.11
+Version: 2.15.12
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.15.11.tar.bz2
+Source0: yast2-update-2.15.12.tar.bz2
prefix: /usr
-BuildRequires: perl-XML-Writer yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite
+BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite
Requires: yast2
Requires: yast2-installation
Requires: yast2-packager
@@ -51,7 +51,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.15.11
+%setup -n yast2-update-2.15.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -77,7 +77,7 @@
%files
%defattr(-,root,root)
%{prefix}/lib/YaST2/bin/*
-#%{prefix}/share/applications/YaST2/*.desktop
+%{prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/modules/*
/usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/include/update
@@ -86,6 +86,15 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog
+* Thu May 17 2007 - locilka@suse.cz
+- System Update icon is back in Control Center (#274064)
+- System Update functionality is allowed only when product versions
+ are matching (can have a different name). Non-matching product
+ means no possibility for System Update.
+- Warning is printed when versions match but product names are
+ different (#274064).
+- System Update temporarily renamed to 'FACTORY Update'.
+- 2.15.12
* Thu May 03 2007 - lslezak@suse.cz
- Don't display excessive progress popup (#269920)
- 2.15.11
++++++ yast2-update-2.15.11.tar.bz2 -> yast2-update-2.15.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/configure new/yast2-update-2.15.12/configure
--- old/yast2-update-2.15.11/configure 2007-05-03 16:37:46.000000000 +0200
+++ new/yast2-update-2.15.12/configure 2007-05-18 17:35:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-update 2.15.11.
+# Generated by GNU Autoconf 2.60 for yast2-update 2.15.12.
#
# 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.15.11'
-PACKAGE_STRING='yast2-update 2.15.11'
+PACKAGE_VERSION='2.15.12'
+PACKAGE_STRING='yast2-update 2.15.12'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.11 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.15.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.15.11:";;
+ short | recursive ) echo "Configuration of yast2-update 2.15.12:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.15.11
+yast2-update configure 2.15.12
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.11, which was
+It was created by yast2-update $as_me 2.15.12, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.15.11'
+ VERSION='2.15.12'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.11"
+VERSION="2.15.12"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
@@ -3260,7 +3260,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.15.11, which was
+This file was extended by yast2-update $as_me 2.15.12, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.15.11
+yast2-update config.status 2.15.12
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/configure.in new/yast2-update-2.15.12/configure.in
--- old/yast2-update-2.15.11/configure.in 2007-05-03 16:37:39.000000000 +0200
+++ new/yast2-update-2.15.12/configure.in 2007-05-18 17:35:37.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.15.11, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.15.12, http://bugs.opensuse.org/, yast2-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.11"
+VERSION="2.15.12"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/clients/update_proposal.ycp new/yast2-update-2.15.12/src/clients/update_proposal.ycp
--- old/yast2-update-2.15.11/src/clients/update_proposal.ycp 2007-05-03 16:02:14.000000000 +0200
+++ new/yast2-update-2.15.12/src/clients/update_proposal.ycp 2007-05-18 17:26:10.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 37811 2007-05-03 14:02:12Z lslezak $
+ * $Id: update_proposal.ycp 38044 2007-05-18 15:26:10Z locilka $
*/
{
textdomain "update";
@@ -414,14 +414,49 @@
"raw_proposal" : [] ];
}
+ // TRANSLATORS: unknown product (label)
+ string update_from = _("Unknown product");
+ if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") {
+ update_from = Update::installedVersion["show"]:"";
+ } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") {
+ update_from = Update::installedVersion["name"]:"";
+ }
+
+ // TRANSLATORS: unknown product (label)
+ string update_to = _("Unknown product");
+ if (Update::updateVersion["show"]:"" != "") {
+ update_to = Update::updateVersion["show"]:"";
+ } else if (Update::updateVersion["version"]:"" != "") {
+ update_to = Update::updateVersion["name"]:"";
+ }
+
// when versions don't match and upgrade is not allowed (running system)
- if ((Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B") && Update::disallow_upgrade) {
- // proposal error
- return $[ "warning" : _("Updating to another version is not supported from the running system."),
+ if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) {
+ return $[ "warning" : sformat(
+ // TRANSLATORS: proposal error, %1 is the version of installed system
+ // %2 is the version being installed
+ _("Updating system to another version (%1 -> %2) is not supported on the running system.<br>
+Please, boot from the installation media and use a normal upgrade
+or disable installation sources of products with different versions."),
+ update_from, update_to
+ ),
"warning_level" : `fatal,
"raw_proposal" : [] ];
}
+ string warning_message = nil;
+ // when labels don't match
+ if (Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B") {
+ warning_message = sformat(
+ // TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names
+ _("Warning: Updating from '%1' to '%2', products do not exactly match."),
+ // TRANSLATORS: unknown product name
+ _("Unknown product"),
+ // TRANSLATORS: unknown product name
+ _("Unknown product")
+ );
+ }
+
// stores the proposal text output
string summary_text = "";
@@ -482,6 +517,11 @@
"preformatted_proposal" : HTML::ListStart() + summary_text + HTML::ListEnd(),
"help" : update_options_help,
];
+
+ if (warning_message != nil) {
+ ret["warning"] = warning_message;
+ ret["warning_level"] = `warning;
+ }
}
else if ( func == "AskUser" )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/config/Makefile.am new/yast2-update-2.15.12/src/config/Makefile.am
--- old/yast2-update-2.15.11/src/config/Makefile.am 2007-04-23 13:32:23.000000000 +0200
+++ new/yast2-update-2.15.12/src/config/Makefile.am 2007-05-18 10:44:11.000000000 +0200
@@ -7,4 +7,6 @@
control_DATA = \
update.xml
+desktop_DATA = update.desktop
+
EXTRA_DIST = $(desktop_DATA) $(control_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/config/Makefile.in new/yast2-update-2.15.12/src/config/Makefile.in
--- old/yast2-update-2.15.11/src/config/Makefile.in 2007-05-03 16:37:47.000000000 +0200
+++ new/yast2-update-2.15.12/src/config/Makefile.in 2007-05-18 17:35:44.000000000 +0200
@@ -57,9 +57,10 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(controldir)"
+am__installdirs = "$(DESTDIR)$(controldir)" "$(DESTDIR)$(desktopdir)"
controlDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(control_DATA)
+desktopDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(control_DATA) $(desktop_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -174,6 +175,7 @@
control_DATA = \
update.xml
+desktop_DATA = update.desktop
EXTRA_DIST = $(desktop_DATA) $(control_DATA)
all: all-am
@@ -225,6 +227,23 @@
echo " rm -f '$(DESTDIR)$(controldir)/$$f'"; \
rm -f "$(DESTDIR)$(controldir)/$$f"; \
done
+install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
+ $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
+ done
+
+uninstall-desktopDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -263,7 +282,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(controldir)"; do \
+ for dir in "$(DESTDIR)$(controldir)" "$(DESTDIR)$(desktopdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -308,7 +327,7 @@
info-am:
-install-data-am: install-controlDATA
+install-data-am: install-controlDATA install-desktopDATA
install-exec-am:
@@ -334,17 +353,18 @@
ps-am:
-uninstall-am: uninstall-controlDATA uninstall-info-am
+uninstall-am: uninstall-controlDATA uninstall-desktopDATA \
+ uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-controlDATA install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-controlDATA \
- uninstall-info-am
+ install-data-am install-desktopDATA install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-controlDATA uninstall-desktopDATA uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/config/update.desktop new/yast2-update-2.15.12/src/config/update.desktop
--- old/yast2-update-2.15.11/src/config/update.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-2.15.12/src/config/update.desktop 2007-05-18 13:47:11.000000000 +0200
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=update
+
+X-SuSE-YaST-Group=Software
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoinstResource=
+
+Icon=yast-update
+Exec=/sbin/yast2 update
+
+Name=FACTORY Update
+GenericName=Update your system to the newest packages from FACTORY (expert tool)
+Comment=Update your system to the newest packages from FACTORY (expert tool)
+X-KDE-SubstituteUID=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/modules/RootPart.ycp new/yast2-update-2.15.12/src/modules/RootPart.ycp
--- old/yast2-update-2.15.11/src/modules/RootPart.ycp 2007-04-23 13:32:23.000000000 +0200
+++ new/yast2-update-2.15.12/src/modules/RootPart.ycp 2007-05-18 10:44:11.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 37337 2007-04-05 12:43:28Z locilka $
+ * $Id: RootPart.ycp 37857 2007-05-07 13:38:20Z arvin $
*/
{
module "RootPart";
@@ -563,7 +563,7 @@
}
/**
- * Find a monut poing in fstab
+ * Find a mount point in fstab
* @param fstab a list of fstab entries
* @param mountpoint string a mount point to find
* @return string the found partition
@@ -1273,6 +1273,8 @@
fstab[0,"spec"]:"" );
// Why this doesn't match?
+ // Possible reasons:
+ // - /var not mounted so hwinfo cannot translate device names
if (ok != true) {
y2warning ("Device does not match fstab: '%1' vs. '%2'", p_dev, fstab[0,"spec"]:"");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/src/modules/Update.ycp new/yast2-update-2.15.12/src/modules/Update.ycp
--- old/yast2-update-2.15.11/src/modules/Update.ycp 2007-02-23 10:33:21.000000000 +0100
+++ new/yast2-update-2.15.12/src/modules/Update.ycp 2007-05-18 17:26:10.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Update module
*
- * $Id: Update.ycp 36182 2007-02-15 13:21:54Z locilka $
+ * $Id: Update.ycp 38044 2007-05-18 15:26:10Z locilka $
*/
{
module "Update";
@@ -443,7 +443,11 @@
*/
global define void fill_version_map (map & data)
{
- data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?";
+ if (data["name"]:"?" == "?" && data["version"]:"?" == "?") {
+ data["nameandversion"] = "?";
+ } else {
+ data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?";
+ }
list <string> tmp0 = [];
if (regexpmatch (data["version"]:"", " -")) {
@@ -532,6 +536,7 @@
// get new product name
integer num = size (Packages::theSources);
+
if (num <= 0)
{
y2error ("No source");
@@ -541,8 +546,35 @@
return false;
}
- map new_product = Pkg::SourceProductData (Packages::theSources[num-1]:0);
- y2milestone ("First source product %1", new_product);
+ integer update_to_source = nil;
+
+ // So-called System Update
+ if (Stage::normal()) {
+ foreach (integer source_id, Packages::theSources, {
+ map source_map = Pkg::SourceProductData(source_id);
+
+ // source need to be described
+ if (source_map != $[]) {
+ if (source_map["productversion"]:"A" == installedVersion["version"]:"B") {
+ y2milestone ("Found matching product: %1", source_map);
+ // first valid product is selected
+ if (update_to_source == nil)
+ update_to_source = source_id;
+ } else {
+ y2error ("Found non-matching product: %1", source_map);
+ // every invalid product is selected
+ update_to_source = source_id;
+ }
+ }
+ });
+ }
+
+ // a fallback for Stage::normal(), default for !Stage::normal()
+ if (update_to_source == nil) update_to_source = Packages::theSources[num-1]:0;
+
+ map new_product = Pkg::SourceProductData (update_to_source);
+ y2milestone ("Product to update to: %1 %2", update_to_source, new_product);
+
if (new_product == nil)
{
updateVersion["name"] = "?";
@@ -556,7 +588,12 @@
updateVersion["show"] = new_product["label"]:nil;
if (updateVersion["show"]:nil == nil) {
y2warning ("No \"label\" defined in product");
- updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?";
+
+ if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") {
+ updateVersion["show"] = "?";
+ } else {
+ updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?";
+ }
}
updateVersion["name"] = new_product["label"]:new_product["productname"]:"?";
updateVersion["version"] = new_product["productversion"]:"?";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.11/VERSION new/yast2-update-2.15.12/VERSION
--- old/yast2-update-2.15.11/VERSION 2007-05-03 15:50:53.000000000 +0200
+++ new/yast2-update-2.15.12/VERSION 2007-05-18 13:49:39.000000000 +0200
@@ -1 +1 @@
-2.15.11
+2.15.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org