Hello community,
here is the log from the commit of package yast2-update
checked in at Fri Nov 2 01:35:36 CET 2007.
--------
--- yast2-update/yast2-update.changes 2007-10-31 13:22:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-11-01 16:48:06.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Nov 1 16:47:44 CET 2007 - locilka(a)suse.cz
+
+- Update/backup-related variables were moved from Update::* to
+ Installation::update_* to remove RPM dependencies.
+- 2.16.1
+
+-------------------------------------------------------------------
+Thu Nov 1 15:39:45 CET 2007 - locilka(a)suse.cz
+
+- Removed #!BuildIgnore: autoyast2-installation because recent
+ changes have already fixed the dependency loop.
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.16.0.tar.bz2
New:
----
yast2-update-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.Yv6178/_old 2007-11-02 01:30:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Yv6178/_new 2007-11-02 01:30:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.16.0)
+# spec file for package yast2-update (Version 2.16.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,20 +11,19 @@
# norootforbuild
Name: yast2-update
-Version: 2.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.16.0.tar.bz2
+Source0: yast2-update-2.16.1.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite
-BuildRequires: yast2 >= 2.16.4
+BuildRequires: yast2 >= 2.16.5
# package not really needed to be installed but this breaks the building cycle
-# FIXME !!!
-#!BuildIgnore: autoyast2-installation
# Installation::installedVersion && Installation::updateVersion
-Requires: yast2 >= 2.16.4
+# Update::* moved to Installation::update_*
+Requires: yast2 >= 2.16.5
Requires: yast2-installation
Requires: yast2-packager
# moved into yast2-update from yast2-installation
@@ -39,12 +38,12 @@
Summary: YaST2 - Update
%package FACTORY
-Version: 2.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.16.0.tar.bz2
+Source0: yast2-update-2.16.1.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools
Requires: yast2-update yast2
@@ -76,7 +75,7 @@
Jiri Srain <jsrain(a)suse.cz>
%prep
-%setup -n yast2-update-2.16.0
+%setup -n yast2-update-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -121,6 +120,13 @@
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp
%changelog
+* Thu Nov 01 2007 - locilka(a)suse.cz
+- Update/backup-related variables were moved from Update::* to
+ Installation::update_* to remove RPM dependencies.
+- 2.16.1
+* Thu Nov 01 2007 - locilka(a)suse.cz
+- Removed #!BuildIgnore: autoyast2-installation because recent
+ changes have already fixed the dependency loop.
* Wed Oct 31 2007 - locilka(a)suse.cz
- installedVersion and updateVersion moved from 'Update' to
'Installation' YCP module to remove dependencies.
++++++ yast2-update-2.16.0.tar.bz2 -> yast2-update-2.16.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.0/src/clients/backup_proposal.ycp new/yast2-update-2.16.1/src/clients/backup_proposal.ycp
--- old/yast2-update-2.16.0/src/clients/backup_proposal.ycp 2007-05-18 10:44:11.000000000 +0200
+++ new/yast2-update-2.16.1/src/clients/backup_proposal.ycp 2007-11-01 16:59:06.000000000 +0100
@@ -2,16 +2,18 @@
* Module: backup_proposal.ycp
*
* Author: Arvin Schnell <arvin(a)suse.de>
+ * Lukas Ocilka <locilka(a)suse.cz>
*
* Purpose: Let user choose backup during update.
*
- * $Id: backup_proposal.ycp 33392 2006-10-13 11:39:53Z locilka $
+ * $Id: backup_proposal.ycp 41725 2007-11-01 15:59:05Z locilka $
*/
{
textdomain "update";
import "HTML";
import "Update";
+ import "Installation";
string func = (string) WFM::Args(0);
map param = (map) WFM::Args(1);
@@ -30,21 +32,21 @@
if (force_reset)
{
- Update::backup_modified = true;
- Update::backup_sysconfig = true;
- Update::remove_old_backups = false;
+ Installation::update_backup_modified = true;
+ Installation::update_backup_sysconfig = true;
+ Installation::update_remove_old_backups = false;
}
list<string> tmp = [];
- if (Update::backup_modified || Update::backup_sysconfig)
+ if (Installation::update_backup_modified || Installation::update_backup_sysconfig)
{
- if (Update::backup_modified) {
+ if (Installation::update_backup_modified) {
// Proposal for backup during update
tmp = add (tmp, _("Create Backup of Modified Files"));
}
- if (Update::backup_sysconfig) {
+ if (Installation::update_backup_sysconfig) {
// Proposal for backup during update
tmp = add (tmp, _("Create Backup of /etc/sysconfig Directory"));
}
@@ -54,7 +56,7 @@
tmp = add (tmp, _("Do Not Create Backups"));
}
- if (Update::remove_old_backups) {
+ if (Installation::update_remove_old_backups) {
// Proposal for backup during update
tmp = add (tmp, _("Remove Backups from Previous Updates"));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.0/src/clients/inst_backup.ycp new/yast2-update-2.16.1/src/clients/inst_backup.ycp
--- old/yast2-update-2.16.0/src/clients/inst_backup.ycp 2007-05-18 10:44:11.000000000 +0200
+++ new/yast2-update-2.16.1/src/clients/inst_backup.ycp 2007-11-01 16:59:06.000000000 +0100
@@ -3,10 +3,11 @@
*
* Authors: Stefan Schubert <schubi(a)suse.de>
* Arvin Schnell <arvin(a)suse.de>
+ * Lukas Ocilka <locilka(a)suse.cz>
*
* Purpose: Ask the user for backups during the update.
*
- * $Id: inst_backup.ycp 33392 2006-10-13 11:39:53Z locilka $
+ * $Id: inst_backup.ycp 41725 2007-11-01 15:59:05Z locilka $
*/
{
@@ -17,6 +18,7 @@
import "SpaceCalculation";
import "Wizard";
import "Popup";
+ import "Installation";
//
@@ -25,7 +27,7 @@
define boolean check_backup_path (list<map> part_info)
{
- string backup_path = Update::backup_path;
+ string backup_path = Installation::update_backup_path;
integer min_space = 50;
boolean found = false;
@@ -142,14 +144,14 @@
// help text for backup dialog during update 7/7
help_text = help_text + sformat (_("<p>All backups are placed in %1.</p>"),
- Update::backup_path);
+ Installation::update_backup_path);
Wizard::SetContents (title, contents, help_text, (boolean) WFM::Args(0), (boolean) WFM::Args(1));
- UI::ChangeWidget (`id(`modified), `Value, Update::backup_modified);
- UI::ChangeWidget (`id(`sysconfig), `Value, Update::backup_sysconfig);
- UI::ChangeWidget (`id(`remove), `Value, Update::remove_old_backups);
+ UI::ChangeWidget (`id(`modified), `Value, Installation::update_backup_modified);
+ UI::ChangeWidget (`id(`sysconfig), `Value, Installation::update_backup_sysconfig);
+ UI::ChangeWidget (`id(`remove), `Value, Installation::update_remove_old_backups);
any ret = nil;
@@ -172,9 +174,9 @@
if (tmp && !check_backup_path (partition))
continue;
- Update::backup_modified = (boolean) UI::QueryWidget (`id(`modified), `Value);
- Update::backup_sysconfig = (boolean) UI::QueryWidget (`id(`sysconfig), `Value);
- Update::remove_old_backups = (boolean) UI::QueryWidget (`id(`remove), `Value);
+ Installation::update_backup_modified = (boolean) UI::QueryWidget (`id(`modified), `Value);
+ Installation::update_backup_sysconfig = (boolean) UI::QueryWidget (`id(`sysconfig), `Value);
+ Installation::update_remove_old_backups = (boolean) UI::QueryWidget (`id(`remove), `Value);
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.0/src/modules/Update.ycp new/yast2-update-2.16.1/src/modules/Update.ycp
--- old/yast2-update-2.16.0/src/modules/Update.ycp 2007-10-31 13:22:48.000000000 +0100
+++ new/yast2-update-2.16.1/src/modules/Update.ycp 2007-11-01 16:48:16.000000000 +0100
@@ -3,10 +3,11 @@
*
* Authors: Anas Nashif <nashif(a)suse.de>
* Arvin Schnell <arvin(a)suse.de>
+ * Lukas Ocilka <locilka(a)suse.cz>
*
* Purpose: Update module
*
- * $Id: Update.ycp 41669 2007-10-31 12:22:48Z locilka $
+ * $Id: Update.ycp 41721 2007-11-01 15:48:16Z locilka $
*/
{
module "Update";
@@ -51,16 +52,8 @@
global boolean did_init2 = false;
-
global integer last_runlevel = -1;
-
- global boolean backup_modified = true;
- global boolean backup_sysconfig = true;
- global boolean remove_old_backups = false;
- global string backup_path = "/var/adm/backup";
-
-
// Only an update, NOT an upgrade
global boolean onlyUpdateInstalled = nil;
@@ -424,10 +417,10 @@
products_incompatible = false;
_products_compatible = nil;
- backup_modified = true;
- backup_sysconfig = true;
- remove_old_backups = false;
- backup_path = "/var/adm/backup";
+ Installation::update_backup_modified = true;
+ Installation::update_backup_sysconfig = true;
+ Installation::update_remove_old_backups = false;
+ Installation::update_backup_path = "/var/adm/backup";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.0/VERSION new/yast2-update-2.16.1/VERSION
--- old/yast2-update-2.16.0/VERSION 2007-10-31 13:16:58.000000000 +0100
+++ new/yast2-update-2.16.1/VERSION 2007-11-01 16:40:52.000000000 +0100
@@ -1 +1 @@
-2.16.0
+2.16.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
