Author: locilka Date: Tue Jun 3 18:41:26 2008 New Revision: 48033 URL: http://svn.opensuse.org/viewcvs/yast?rev=48033&view=rev Log: - New option 'Back Up Content of All Packages' has been added to backup not only changed files but all (bnc #344643). Modified: trunk/backup/package/yast2-backup.changes trunk/backup/src/Backup.ycp trunk/backup/src/help_texts.ycp trunk/backup/src/scripts/backup_search.pl trunk/backup/src/ui.ycp Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.changes?rev=48033&r1=48032&r2=48033&view=diff ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Tue Jun 3 18:41:26 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 3 18:38:51 CEST 2008 - locilka@suse.cz + +- New option 'Back Up Content of All Packages' has been added to + backup not only changed files but all (bnc #344643). + +------------------------------------------------------------------- Mon Jun 2 18:07:34 CEST 2008 - locilka@suse.cz - TextEntry items replaced with InputField items. Modified: trunk/backup/src/Backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/Backup.ycp?rev=48033&r1=48032&r2=48033&view=diff ============================================================================== --- trunk/backup/src/Backup.ycp (original) +++ trunk/backup/src/Backup.ycp Tue Jun 3 18:41:26 2008 @@ -115,6 +115,7 @@ global symbol default_user_volume_unit = nil; global boolean default_search = true; // search files which do not belong to any package +global boolean default_all_rpms_content = false; // by default only changed RPM-files are backed up global boolean default_system = false; // backup system areas global boolean default_display = false; // display files before creating archive global boolean default_do_md5_test = true; @@ -177,9 +178,10 @@ global string temporary_dir = default_temporary_dir; global boolean mail_summary = default_mail_summary; -global boolean do_search = default_search; // search files which do not belong to any package -global boolean system = default_system; // backup system areas -global boolean display = default_display; // display files before creating archive +global boolean do_search = default_search; // search files which do not belong to any package +global boolean backup_all_rpms_content = default_all_rpms_content; // backup content of all packages +global boolean system = default_system; // backup system areas +global boolean display = default_display; // display files before creating archive global boolean do_md5_test = default_do_md5_test; global boolean perms = default_perms; @@ -371,6 +373,12 @@ global define string get_search_script_parameters() ``{ string script_options = " --start-dir / --output-progress"; // required parameter for YaST2 frontend + if (backup_all_rpms_content) { + // see bnc #344643 + y2milestone ("Backup all RPMs content..."); + script_options = script_options + " --all-rpms-content"; + } + if (do_search) { script_options = script_options + " --search"; @@ -1198,6 +1206,7 @@ `user_volume_size : user_volume_size, `user_volume_unit : user_volume_unit, `search : do_search, + `all_rpms_content : backup_all_rpms_content, `system : system, `display : display, `do_md5_test : do_md5_test, @@ -1260,6 +1269,7 @@ user_volume_size = profile[ `user_volume_size ]: default_user_volume_size; user_volume_unit = profile[ `user_volume_unit ]: default_user_volume_unit; do_search = profile[ `search ]: default_search; + backup_all_rpms_content = profile[ `all_rpms_content ]: default_all_rpms_content; system = profile[ `system ]: default_system; display = profile[ `display ]: default_display; do_md5_test = profile[ `do_md5_test ]: default_do_md5_test; @@ -1350,6 +1360,7 @@ user_volume_size = default_user_volume_size; user_volume_unit = default_user_volume_unit; do_search = default_search; + backup_all_rpms_content = default_all_rpms_content; system = default_system; display = default_display; do_md5_test = default_do_md5_test; Modified: trunk/backup/src/help_texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/help_texts.ycp?rev=48033&r1=48032&r2=48033&view=diff ============================================================================== --- trunk/backup/src/help_texts.ycp (original) +++ trunk/backup/src/help_texts.ycp Tue Jun 3 18:41:26 2008 @@ -74,20 +74,25 @@ */ define string backup_help_backup_setting() ``{ - // For translators: help text in backup settings dialog - part 1/4 + // For translators: help text in backup settings dialog - part 1 return _("<P><B><BIG>Backup Options</BIG></B><BR>Here, select which parts of the system to search and back up. <B>Archive Description</B> is an optional description of the backup archive.</P>") - // For translators: help text in backup settings dialog - part 2/4 + // For translators: help text in backup settings dialog - part 2 + _("<P>The archive will contain files from packages that were changed since package installation or upgrade. Files that do not belong to any package can be optionally added to the archive.</P>") - // For translators: help text in backup settings dialog - part 3/4 + // For translators: help text in backup settings dialog - part 3 + _("<P>Check <B>Display List of Files</B> to show and edit a list of files found before creating the backup archive.</P>") - // For translators: help text in backup settings dialog - part 4/4 - + _("<P>If you select <b>Check MD5 Sum</b>, the MD5 sum is used to determine if the file was changed. It is more reliable than checking the size or modification time, but takes longer.</P>"); + // For translators: help text in backup settings dialog - part 4 + + _("<P>If you select <b>Check MD5 Sum</b>, the MD5 sum is used to determine if the file was changed. It is more reliable than checking the size or modification time, but takes longer.</P>") + // TRANSLATORS: help text in backup settings dialog - part 5 + + _("<p>Select <b>Backup Content of All Packages</b> to backup all files belonging +to all installed packages. This option is useful when the same installation +repositories or the same packages needn't be available when restoring the archive. +It is faster not to use this option.</p>"); } Modified: trunk/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/scripts/backup_search.pl?rev=48033&r1=48032&r2=48033&view=diff ============================================================================== --- trunk/backup/src/scripts/backup_search.pl (original) +++ trunk/backup/src/scripts/backup_search.pl Tue Jun 3 18:41:26 2008 @@ -47,6 +47,7 @@ my $output_default = 0; my $no_md5 = 0; my $pkg_verification = 0; +my $backup_all_rpms_content = 0; my $inst_src_packages = ""; my %instalable_packages; @@ -67,7 +68,7 @@ 'start-dir=s' => \$start_directory, 'same-fs' => \$same_fs, 'pkg-verification' => \$pkg_verification, 'no-md5' => \$no_md5, 'inst-src-packages=s'=> \$inst_src_packages, - 'include-dir=s' => \@include_d, + 'include-dir=s' => \@include_d, 'all-rpms-content' => \$backup_all_rpms_content, ); if ($help) @@ -78,13 +79,14 @@ print "Options:\n\n"; - print " --no-md5 Do not use MD5 test in verification\n"; + print " --no-md5 Do not use MD5 test in verification\n"; + print " --all-rpms-content All RPMs will be backed up completely\n"; print " --search Search files which do not belog to any package\n"; print " --exclude-dir <dir> Exclude directory <dir> from search\n"; print " --exclude-fs <fs> Exclude filesystem <fs> from search\n"; print " --exclude-files <r> Exclude files matching regular expression <r>\n"; - + print " --include-dir <dir> Only directories listed are backed up\n"; print " --output-files Display only names of files to backup\n"; @@ -212,6 +214,14 @@ } } +# bnc #344643 +# backup all installed packages +if ($backup_all_rpms_content) { + foreach my $pk (@installed_packages) { + $unavailable_pkgs{$pk} = 1; + } +} + undef %instalable_packages; undef %installed_packages_hash; Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=48033&r1=48032&r2=48033&view=diff ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Tue Jun 3 18:41:26 2008 @@ -1236,6 +1236,8 @@ `VSpacing(0.3), // check box label `Left(`CheckBox(`id(`search), `opt(`notify), _("&Back Up Files Not Belonging to Any Package"), Backup::do_search)), + // check box label + `Left(`CheckBox(`id(`all_rpms_content), `opt(`notify), _("Back Up Content of &All Packages"), Backup::backup_all_rpms_content)), `VSpacing(0.3), // check box label `Left(`CheckBox(`id(`display), _("Display List of Files Before &Creating Archive"), Backup::display)), @@ -1284,6 +1286,7 @@ } // get values + Backup::backup_all_rpms_content = (boolean) UI::QueryWidget(`id(`all_rpms_content), `Value); Backup::do_search = (boolean)UI::QueryWidget(`id(`search), `Value); Backup::display = (boolean)UI::QueryWidget(`id(`display), `Value); Backup::do_md5_test = (boolean)UI::QueryWidget(`id(`md5_check), `Value); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org