![](https://seccdn.libravatar.org/avatar/2e1a2d7374f0eeb790839676bdd1123a.jpg?s=120&d=mm&r=g)
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=41717&r2=41718&view=diff ============================================================================== --- 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.changes?rev=41718&r1=41717&r2=41718&view=diff ============================================================================== --- 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@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@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_kickoff.ycp?rev=41718&r1=41717&r2=41718&view=diff ============================================================================== --- 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?rev=41718&r1=41717&r2=41718&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org