Author: locilka
Date: Thu Nov 1 16:48:16 2007
New Revision: 41721
URL: http://svn.opensuse.org/viewcvs/yast?rev=41721&view=rev
Log:
- Update/backup-related variables were moved from Update::* to
Installation::update_* to remove RPM dependencies.
- 2.16.1
Modified:
trunk/update/VERSION
trunk/update/package/yast2-update.changes
trunk/update/src/clients/backup_proposal.ycp
trunk/update/src/clients/inst_backup.ycp
trunk/update/src/modules/Update.ycp
trunk/update/yast2-update.spec.in
Modified: trunk/update/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=41721&r1=41720&r2=41721&view=diff
==============================================================================
--- trunk/update/VERSION (original)
+++ trunk/update/VERSION Thu Nov 1 16:48:16 2007
@@ -1 +1 @@
-2.16.0
+2.16.1
Modified: trunk/update/package/yast2-update.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=41721&r1=41720&r2=41721&view=diff
==============================================================================
--- trunk/update/package/yast2-update.changes (original)
+++ trunk/update/package/yast2-update.changes Thu Nov 1 16:48:16 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Nov 1 16:47:44 CET 2007 - locilka@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@suse.cz
- Removed #!BuildIgnore: autoyast2-installation because recent
Modified: trunk/update/src/clients/backup_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/backup_proposal.ycp?rev=41721&r1=41720&r2=41721&view=diff
==============================================================================
--- trunk/update/src/clients/backup_proposal.ycp (original)
+++ trunk/update/src/clients/backup_proposal.ycp Thu Nov 1 16:48:16 2007
@@ -2,10 +2,11 @@
* Module: backup_proposal.ycp
*
* Author: Arvin Schnell
+ * Lukas Ocilka
*
* Purpose: Let user choose backup during update.
*
- * $Id:$
+ * $Id$
*/
{
textdomain "update";
@@ -30,21 +31,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 +55,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"));
}
Modified: trunk/update/src/clients/inst_backup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_backup.ycp?rev=41721&r1=41720&r2=41721&view=diff
==============================================================================
--- trunk/update/src/clients/inst_backup.ycp (original)
+++ trunk/update/src/clients/inst_backup.ycp Thu Nov 1 16:48:16 2007
@@ -3,10 +3,11 @@
*
* Authors: Stefan Schubert
* Arvin Schnell
+ * Lukas Ocilka
*
* Purpose: Ask the user for backups during the update.
*
- * $Id:$
+ * $Id$
*/
{
@@ -147,9 +148,9 @@
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(`modified), `Value, Installation::update_backup_modified);
UI::ChangeWidget (`id(`sysconfig), `Value, Update::backup_sysconfig);
- UI::ChangeWidget (`id(`remove), `Value, Update::remove_old_backups);
+ UI::ChangeWidget (`id(`remove), `Value, Installation::update_remove_old_backups);
any ret = nil;
@@ -172,9 +173,9 @@
if (tmp && !check_backup_path (partition))
continue;
- Update::backup_modified = (boolean) UI::QueryWidget (`id(`modified), `Value);
+ Installation::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_remove_old_backups = (boolean) UI::QueryWidget (`id(`remove), `Value);
break;
}
Modified: trunk/update/src/modules/Update.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?rev=41721&r1=41720&r2=41721&view=diff
==============================================================================
--- trunk/update/src/modules/Update.ycp (original)
+++ trunk/update/src/modules/Update.ycp Thu Nov 1 16:48:16 2007
@@ -3,6 +3,7 @@
*
* Authors: Anas Nashif
* Arvin Schnell
+ * Lukas Ocilka
*
* Purpose: Update module
*
@@ -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";
}
Modified: trunk/update/yast2-update.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=41721&r1=41720&r2=41721&view=diff
==============================================================================
--- trunk/update/yast2-update.spec.in (original)
+++ trunk/update/yast2-update.spec.in Thu Nov 1 16:48:16 2007
@@ -2,11 +2,12 @@
@HEADER@
BuildRequires: yast2-storage yast2-packager perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files
-BuildRequires: yast2 >= 2.16.4
+BuildRequires: yast2 >= 2.16.5
# package not really needed to be installed but this breaks the building cycle
# 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
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
