November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41726 - /tags/stable-2_16_1/update/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:59:15 2007 New Revision: 41726 URL: http://svn.opensuse.org/viewcvs/yast?rev=41726&view=rev Log: Created tag stable-2_16_1 for update Added: tags/stable-2_16_1/update/ - copied from r41725, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41725 - in /trunk/update/src/clients: backup_proposal.ycp inst_backup.ycp
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:59:05 2007 New Revision: 41725 URL: http://svn.opensuse.org/viewcvs/yast?rev=41725&view=rev Log: Some more changes from Update::* to Installation::update_* Modified: trunk/update/src/clients/backup_proposal.ycp trunk/update/src/clients/inst_backup.ycp Modified: trunk/update/src/clients/backup_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/backup_propos… ============================================================================== --- trunk/update/src/clients/backup_proposal.ycp (original) +++ trunk/update/src/clients/backup_proposal.ycp Thu Nov 1 16:59:05 2007 @@ -13,6 +13,7 @@ import "HTML"; import "Update"; + import "Installation"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); Modified: trunk/update/src/clients/inst_backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_backup.y… ============================================================================== --- trunk/update/src/clients/inst_backup.ycp (original) +++ trunk/update/src/clients/inst_backup.ycp Thu Nov 1 16:59:05 2007 @@ -18,6 +18,7 @@ import "SpaceCalculation"; import "Wizard"; import "Popup"; + import "Installation"; // @@ -26,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; @@ -143,13 +144,13 @@ // 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, Installation::update_backup_modified); - UI::ChangeWidget (`id(`sysconfig), `Value, Update::backup_sysconfig); + UI::ChangeWidget (`id(`sysconfig), `Value, Installation::update_backup_sysconfig); UI::ChangeWidget (`id(`remove), `Value, Installation::update_remove_old_backups); any ret = nil; @@ -174,7 +175,7 @@ continue; Installation::update_backup_modified = (boolean) UI::QueryWidget (`id(`modified), `Value); - Update::backup_sysconfig = (boolean) UI::QueryWidget (`id(`sysconfig), `Value); + Installation::update_backup_sysconfig = (boolean) UI::QueryWidget (`id(`sysconfig), `Value); Installation::update_remove_old_backups = (boolean) UI::QueryWidget (`id(`remove), `Value); break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41724 - /tags/stable-2_16_1/update/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:56:12 2007 New Revision: 41724 URL: http://svn.opensuse.org/viewcvs/yast?rev=41724&view=rev Log: Some more fixes Removed: tags/stable-2_16_1/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41723 - /tags/stable-2_16_1/update/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:55:32 2007 New Revision: 41723 URL: http://svn.opensuse.org/viewcvs/yast?rev=41723&view=rev Log: Created tag stable-2_16_1 for update Added: tags/stable-2_16_1/update/ - copied from r41722, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41722 - /tags/stable-2_16_5/yast2/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:51:28 2007 New Revision: 41722 URL: http://svn.opensuse.org/viewcvs/yast?rev=41722&view=rev Log: Created tag stable-2_16_5 for yast2 Added: tags/stable-2_16_5/yast2/ - copied from r41721, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41721 - in /trunk/update: VERSION package/yast2-update.changes src/clients/backup_proposal.ycp src/clients/inst_backup.ycp src/modules/Update.ycp yast2-update.spec.in
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

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=4172… ============================================================================== --- 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.chan… ============================================================================== --- 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(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 Modified: trunk/update/src/clients/backup_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/backup_propos… ============================================================================== --- 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 <arvin(a)suse.de> + * Lukas Ocilka <locilka(a)suse.cz> * * 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.y… ============================================================================== --- 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 <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:$ + * $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?re… ============================================================================== --- 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 <nashif(a)suse.de> * Arvin Schnell <arvin(a)suse.de> + * Lukas Ocilka <locilka(a)suse.cz> * * 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=… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41720 - /trunk/yast2/yast2.spec.in
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:45:30 2007 New Revision: 41720 URL: http://svn.opensuse.org/viewcvs/yast?rev=41720&view=rev Log: Forgotten dependency Modified: trunk/yast2/yast2.spec.in Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=41720&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Thu Nov 1 16:45:30 2007 @@ -28,7 +28,7 @@ Conflicts: yast2-network < 2.15.58 # Hotplug and HwStatus modules Conflicts: yast2-installation < 2.16.2 -Conflicts: yast2-update < 2.16.0 +Conflicts: yast2-update < 2.16.1 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41719 - in /trunk/yast2: VERSION library/control/src/Installation.ycp package/yast2.changes
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:44:59 2007 New Revision: 41719 URL: http://svn.opensuse.org/viewcvs/yast?rev=41719&view=rev Log: - Update/backup-related variables were moved from Update::* to Installation::update_* to remove RPM dependencies. - 2.16.5 Modified: trunk/yast2/VERSION trunk/yast2/library/control/src/Installation.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=41719&r1=41718… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Nov 1 16:44:59 2007 @@ -1 +1 @@ -2.16.4 +2.16.5 Modified: trunk/yast2/library/control/src/Installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Instal… ============================================================================== --- trunk/yast2/library/control/src/Installation.ycp (original) +++ trunk/yast2/library/control/src/Installation.ycp Thu Nov 1 16:44:59 2007 @@ -141,6 +141,16 @@ */ global map <string, any> updateVersion = $[]; + // Global variables moved here to break dependencies + // on yast2-update + global boolean update_backup_modified = true; + + global boolean update_backup_sysconfig = true; + + global boolean update_remove_old_backups = false; + + global string update_backup_path = "/var/adm/backup"; + //--------------------------------------------------------------- // constructor Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Nov 1 16:44:59 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 1 16:44:07 CET 2007 - locilka(a)suse.cz + +- Update/backup-related variables were moved from Update::* to + Installation::update_* to remove RPM dependencies. +- 2.16.5 + +------------------------------------------------------------------- Wed Oct 31 13:19:42 CET 2007 - locilka(a)suse.cz - installedVersion and updateVersion moved from 'Update' to -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41718 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp yast2-packager.spec.in
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:43:47 2007 New Revision: 41718 URL: http://svn.opensuse.org/viewcvs/yast?rev=41718&view=rev Log: - Update/backup-related variables were moved from Update::* to Installation::update_* to remove RPM dependencies. - 2.16.2 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_kickoff.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=41718&r1=41… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Nov 1 16:43:47 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Nov 1 16:43:47 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 1 16:41:52 CET 2007 - locilka(a)suse.cz + +- Update/backup-related variables were moved from Update::* to + Installation::update_* to remove RPM dependencies. +- 2.16.2 + +------------------------------------------------------------------- Wed Oct 31 14:13:07 CET 2007 - locilka(a)suse.cz - installedVersion and updateVersion moved from 'Update' to Modified: trunk/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_kickof… ============================================================================== --- trunk/packager/src/clients/inst_kickoff.ycp (original) +++ trunk/packager/src/clients/inst_kickoff.ycp Thu Nov 1 16:43:47 2007 @@ -26,7 +26,6 @@ import "Arch"; import "FileUtils"; import "String"; - import "Update"; void AcpiToInitrd () { if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) @@ -104,12 +103,12 @@ */ define void backup_stuff () ``{ - if (Update::backup_modified) + if (Installation::update_backup_modified) { Pkg::CreateBackups (true); - Pkg::SetBackupPath (Update::backup_path); + Pkg::SetBackupPath (Installation::update_backup_path); SCR::Write (.target.string, Installation::destdir + "/var/lib/YaST2/backup_path", - Update::backup_path); + Installation::update_backup_path); } else { @@ -117,10 +116,10 @@ SCR::Execute (.target.remove, Installation::destdir + "/var/lib/YaST2/backup_path"); } - if (Update::remove_old_backups) + if (Installation::update_remove_old_backups) { SCR::Execute (.target.bash, "cd '" + String::Quote (Installation::destdir) + "'; " + - "/bin/rm -f " + Update::backup_path + "/*-*-*.tar.{gz,bz2}"); + "/bin/rm -f " + Installation::update_backup_path + "/*-*-*.tar.{gz,bz2}"); } if (true) @@ -134,7 +133,7 @@ while (num < 42) { - filename = Update::backup_path + "/YaST2-" + date + "-" + + filename = Installation::update_backup_path + "/YaST2-" + date + "-" + sformat ("%1", num) + ".tar.gz"; if (SCR::Read (.target.size, Installation::destdir + filename) == -1) break; @@ -156,7 +155,7 @@ } } - if (Update::backup_sysconfig) + if (Installation::update_backup_sysconfig) { string date = timestring ("%Y%m%d", time(), false); @@ -169,7 +168,7 @@ while (num < 42) { - filename = Update::backup_path + "/etc.sysconfig-" + date + "-" + + filename = Installation::update_backup_path + "/etc.sysconfig-" + date + "-" + sformat ("%1", num) + ".tar.gz"; if (SCR::Read (.target.size, Installation::destdir + filename) == -1) break; @@ -195,7 +194,7 @@ while (num < 42) { - filename = Update::backup_path + "/etc.rc.config-" + date + "-" + + filename = Installation::update_backup_path + "/etc.rc.config-" + date + "-" + sformat ("%1", num) + ".tar.gz"; if (SCR::Read (.target.size, Installation::destdir + filename) == -1) break; @@ -368,7 +367,7 @@ string kernel = Kernel::ComputePackage (); Kernel::SetInformAboutKernelChange(Pkg::IsSelected (kernel)); - SCR::Execute (.target.mkdir, Installation::destdir + Update::backup_path); + SCR::Execute (.target.mkdir, Installation::destdir + Installation::update_backup_path); backup_stuff (); createmdadm(); } @@ -379,7 +378,7 @@ // make some directories SCR::Execute (.target.mkdir, Installation::destdir + Directory::logdir); - SCR::Execute (.target.mkdir, Installation::destdir + Update::backup_path); + SCR::Execute (.target.mkdir, Installation::destdir + Installation::update_backup_path); // backup some stuff backup_stuff (); Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Thu Nov 1 16:43:47 2007 @@ -5,7 +5,8 @@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp # Installation::installedVersion && Installation::updateVersion -BuildRequires: yast2 >= 2.16.4 +# Update::* moved to Installation::update_* +BuildRequires: yast2 >= 2.16.5 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41717 - /tags/stable-2_16_4/product-creator/
by jsuchome＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: jsuchome Date: Thu Nov 1 16:24:07 2007 New Revision: 41717 URL: http://svn.opensuse.org/viewcvs/yast?rev=41717&view=rev Log: Created tag stable-2_16_4 for product-creator Added: tags/stable-2_16_4/product-creator/ - copied from r41716, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0