April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67944 - in /trunk/dns-server/testsuite/tests.ag: zoneag.err zoneag.ycp
by locilka＠svn2.opensuse.org 17 Apr '12

17 Apr '12

Author: locilka Date: Tue Apr 17 11:24:41 2012 New Revision: 67944 URL: http://svn.opensuse.org/viewcvs/yast?rev=67944&view=rev Log: Adapted testsuite Modified: trunk/dns-server/testsuite/tests.ag/zoneag.err trunk/dns-server/testsuite/tests.ag/zoneag.ycp Modified: trunk/dns-server/testsuite/tests.ag/zoneag.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests.ag/zo… ============================================================================== --- trunk/dns-server/testsuite/tests.ag/zoneag.err (original) +++ trunk/dns-server/testsuite/tests.ag/zoneag.err Tue Apr 17 11:24:41 2012 @@ -1,8 +1,8 @@ [liby2] genericfrontend.cc(main):XXX Launched YaST2 component 'y2base' [liby2] genericfrontend.cc(main):XXX YAST_IS_RUNNING is yes -[YCP] tests.ag/zoneag.ycp:35 Zone: $["TTL":"2W", "records":[$["key":"", "type":"MX", "value":"10 dns.domain.cz."], $["key":"", "type":"MX", "value":"20 sns.domain.cz."], $["key":"", "type":"NS", "value":"dns.domain.cz."], $["key":"", "type":"NS", "value":"sns.domain.cz."], $["key":"dns", "type":"A", "value":"1.2.3.4"], $["key":"sns", "type":"A", "value":"1.2.3.5"], $["key":"other", "type":"A", "value":"1.2.3.6"], $["key":"other2", "type":"A", "value":"1.2.3.7"], $["key":"other2", "type":"MX", "value":"10 other.domain.cz."], $["key":"alias", "type":"CNAME", "value":"dns"], $["key":"alias2", "type":"CNAME", "value":"other2.domain.cz."]], "soa":$["expiry":"1W", "mail":"root.domain.cz.", "minimum":"1D", "refresh":"1H", "retry":"1H", "serial":2003080400, "server":"dns.domain.cz", "zone":"@"]] -[YCP] tests.ag/zoneag.ycp:38 Write ret: true -[YCP] tests.ag/zoneag.ycp:41 New file: $TTL 2W +[YCP] tests.ag/zoneag.ycp:36 Zone: $["TTL":"2W", "records":[$["key":"", "type":"MX", "value":"10 dns.domain.cz."], $["key":"", "type":"MX", "value":"20 sns.domain.cz."], $["key":"", "type":"NS", "value":"dns.domain.cz."], $["key":"", "type":"NS", "value":"sns.domain.cz."], $["key":"dns", "type":"A", "value":"1.2.3.4"], $["key":"sns", "type":"A", "value":"1.2.3.5"], $["key":"other", "type":"A", "value":"1.2.3.6"], $["key":"other2", "type":"A", "value":"1.2.3.7"], $["key":"other2", "type":"MX", "value":"10 other.domain.cz."], $["key":"alias", "type":"CNAME", "value":"dns"], $["key":"alias2", "type":"CNAME", "value":"other2.domain.cz."]], "soa":$["expiry":"1W", "mail":"root.domain.cz.", "minimum":"1D", "refresh":"1H", "retry":"1H", "serial":2003080400, "server":"dns.domain.cz", "zone":"@"]] +[YCP] tests.ag/zoneag.ycp:39 Write ret: true +[YCP] tests.ag/zoneag.ycp:42 New file: $TTL 2W @ IN SOA dns.domain.cz root.domain.cz. ( 2003080400 ; serial 1H ; refresh Modified: trunk/dns-server/testsuite/tests.ag/zoneag.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests.ag/zo… ============================================================================== --- trunk/dns-server/testsuite/tests.ag/zoneag.ycp (original) +++ trunk/dns-server/testsuite/tests.ag/zoneag.ycp Tue Apr 17 11:24:41 2012 @@ -1,9 +1,9 @@ /** * File: - * ppdpatch.ycp + * zoneag.ycp * * Module: - * Printer configurator + * DNS Server Configuration * * Summary: * Testsuite -- 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] r67943 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 17 Apr '12

17 Apr '12

Author: locilka Date: Tue Apr 17 11:12:43 2012 New Revision: 67943 URL: http://svn.opensuse.org/viewcvs/yast?rev=67943&view=rev Log: New version Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=67943&r1=… ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Tue Apr 17 11:12:43 2012 @@ -1 +1 @@ -2.22.1 +2.23.1 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Tue Apr 17 11:12:43 2012 @@ -4,6 +4,7 @@ - Fixed zone-file agent to handle semicolons in TXT records correctly instead of considering them to represent comments (bnc#755766). +- 2.23.1 ------------------------------------------------------------------ Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com -- 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] r67942 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: VERSION package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 17 Apr '12

17 Apr '12

Author: locilka Date: Tue Apr 17 11:11:26 2012 New Revision: 67942 URL: http://svn.opensuse.org/viewcvs/yast?rev=67942&view=rev Log: New version Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION Tue Apr 17 11:11:26 2012 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Tue Apr 17 11:11:26 2012 @@ -4,6 +4,7 @@ - Fixed zone-file agent to handle semicolons in TXT records correctly instead of considering them to represent comments (bnc#755766). +- 2.17.19 ------------------------------------------------------------------ Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com -- 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] r67941 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: VERSION package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 17 Apr '12

17 Apr '12

Author: locilka Date: Tue Apr 17 11:11:15 2012 New Revision: 67941 URL: http://svn.opensuse.org/viewcvs/yast?rev=67941&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION Tue Apr 17 11:11:15 2012 @@ -1 +1 @@ -2.17.14.1 +2.17.14.2 Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Tue Apr 17 11:11:15 2012 @@ -4,6 +4,7 @@ - Fixed zone-file agent to handle semicolons in TXT records correctly instead of considering them to represent comments (bnc#755766). +- 2.17.14.2 ------------------------------------------------------------------ Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com -- 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] r67940 - /trunk/autoinstallation/src/modules/AutoinstStorage.ycp
by ug＠svn2.opensuse.org 16 Apr '12

16 Apr '12

Author: ug Date: Mon Apr 16 16:56:57 2012 New Revision: 67940 URL: http://svn.opensuse.org/viewcvs/yast?rev=67940&view=rev Log: setting disklabel to gpt did not work bnc#757324 Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Mon Apr 16 16:56:57 2012 @@ -786,6 +786,8 @@ if ( Storage::IsRealDisk( data) && data["initialize"]:false == true) { initial_target_map[device,"delete"] = true; + if( haskey( data, "disklabel" )) + initial_target_map[device,"disklabel"] = data["disklabel"]:"msdos"; Storage::SetTargetMap(initial_target_map); } }); -- 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] r67939 - /trunk/autoinstallation/package/autoyast2.changes
by ug＠svn2.opensuse.org 16 Apr '12

16 Apr '12

Author: ug Date: Mon Apr 16 16:56:46 2012 New Revision: 67939 URL: http://svn.opensuse.org/viewcvs/yast?rev=67939&view=rev Log: setting disklabel to gpt did not work bnc#757324 Modified: trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Apr 16 16:56:46 2012 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 16 16:55:42 CEST 2012 - ug(a)suse.de + +- setting disklabel to gpt did not work (bnc#757324) + +------------------------------------------------------------------- Tue Apr 10 16:26:08 CEST 2012 - ug(a)suse.de - license to gpl v2 -- 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] r67938 - in /branches/SuSE-Code-11-SP2-Branch/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn2.opensuse.org 16 Apr '12

16 Apr '12

Author: locilka Date: Mon Apr 16 13:45:42 2012 New Revision: 67938 URL: http://svn.opensuse.org/viewcvs/yast?rev=67938&view=rev Log: - UI refresh in searching for modified files optimized for faster machines (and disks) (BNC #756493). Modified: branches/SuSE-Code-11-SP2-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-SP2-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-SP2-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/backup/package/yast2-backup.changes Mon Apr 16 13:45:42 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 16 13:43:20 CEST 2012 - locilka(a)suse.com + +- UI refresh in searching for modified files optimized for faster + machines (and disks) (BNC #756493). + +------------------------------------------------------------------- Fri Oct 14 12:22:11 CEST 2011 - locilka(a)suse.cz - Using UI::AskForSaveFileName for selecting new/existent file Modified: branches/SuSE-Code-11-SP2-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/backup/src/ui.ycp Mon Apr 16 13:45:42 2012 @@ -1757,8 +1757,31 @@ } } +integer ui_last_refresh = 0; +integer ui_time_now = 0; + +/** + * Updates UI: Modified files size and count + */ +define void Search_UpdateFilesAndSize (integer & modified_size, integer & modified_num) { + # There's no UI in cron mode + if (Backup::cron_mode) + return; + + ui_time_now = time(); + + if (ui_time_now > ui_last_refresh) { + ui_last_refresh = ui_time_now; + + UI::ChangeWidget(`id(`totsize), `Value, + _("Total Size: ") + String::FormatSize (modified_size)); + UI::ChangeWidget(`id(`numfiles), `Value, + _("Modified Files: ") + sformat ("%1", modified_num)); + } +} + /** - * not sure + * Updates UI while searching for modified files */ define void Search_ModifiedFiles () { line = substring(line, size(id_file)); @@ -1767,11 +1790,7 @@ modified_size = modified_size + tointeger(size_str); modified_num = modified_num + 1; - if (!Backup::cron_mode) - { - UI::ChangeWidget(`id(`totsize), `Value, _("Total Size: ") + sformat("%1", String::FormatSize(modified_size))); - UI::ChangeWidget(`id(`numfiles), `Value, _("Modified Files: ") + sformat("%1", modified_num)); - } + Search_UpdateFilesAndSize(modified_size, modified_num); string found_file = substring(line, findfirstof(line, " ") + 1); @@ -1826,7 +1845,7 @@ reading_installed_packages = true; } else { if (line == id_files_read) { - if (Backup::cron_mode != true) { + if (!Backup::cron_mode) { SetDialogContents_SearchingForModifiedFiles(total_packages); UI::RecalcLayout(); } @@ -1882,6 +1901,27 @@ return (string) run_ps["stdout"]:""; } +integer dir_last_refresh = 0; +integer dir_time_now = 0; +string dir_shown = ""; + +define void Search_ShowCurrentDir (string & actual_dir) { + // No update + if (dir_shown == actual_dir) + return; + + dir_time_now = time(); + + if (dir_time_now > dir_last_refresh) { + UI::ChangeWidget(`id(`directory), `Value, _("Searching in Directory: ") + actual_dir); + dir_last_refresh = dir_time_now; + dir_shown = actual_dir; + + // BNC#172406: Cannot be used for ncurses + if (!in_ncurses) UI::RecalcLayout(); + } +} + /** * Display progress of searching modified files in packages * @return symbol Symbol for wizard sequencer - pressed button @@ -1935,6 +1975,7 @@ Search_ChangedPackageFiles(); } else { if (substring(line, 0, size(id_file)) == id_file) { + ui_last_refresh = 0; Search_ModifiedFiles(); } else { if (line == id_nopackage) { @@ -1986,19 +2027,27 @@ // searching files not belonging to any package if (search_no_package) { string actual_dir = "/"; + + # Strings are not localized on purpose: Used for matching output from + # the searching script string id_readingall = "Reading all files"; string id_readall = "Files read"; string id_dir = "Dir: "; + # Chached value + integer size_id_dir = size(id_dir); + if (!Backup::cron_mode) { SetDialogContents_SearchingFiles(); } - integer dircount = 0; + ui_last_refresh = 0; list package_files_part = []; integer new_files = 0; + string dir_shown = ""; + while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) // test of script_out size is needed, because previous while cycle was interrupted and script could exited with no new output... { @@ -2019,12 +2068,7 @@ nopkg_num = nopkg_num + 1; - // refresh status when 10 new files was found - it's faster... - if (nopkg_num % 10 == 0 && Backup::cron_mode != true) - { - UI::ChangeWidget(`id(`totsize), `Value, _("Total Size: ") + String::FormatSize(nopkg_size)); - UI::ChangeWidget(`id(`numfiles), `Value, _("Modified Files: ") + sformat("%1", nopkg_num)); - } + Search_UpdateFilesAndSize(modified_size, modified_num); string found_file = substring(line, findfirstof(line, " ") + 1); @@ -2042,35 +2086,20 @@ new_files = new_files + 1; // merge more files in one step - it's faster - if (new_files == 1000) - { + if (new_files == 1000) { package_files = merge(package_files, package_files_part); package_files_part = []; new_files = 0; } - } - else - { - if (substring(line, 0, size(id_dir)) == id_dir) - { - dircount = dircount + 1; - - if (dircount == 5) - { - actual_dir = substring(line, size(id_dir)); - - if (!Backup::cron_mode) - { - UI::ChangeWidget(`id(`directory), `Value, _("Searching in Directory: ") + actual_dir); - // bug #172406 - // Cannot be used for ncurses - if (!in_ncurses) UI::RecalcLayout(); - } - - dircount = 0; + } else { + if (!Backup::cron_mode) { + if (substring (line, 0, size_id_dir) == id_dir) { + actual_dir = substring(line, size_id_dir); } } } + + Search_ShowCurrentDir (actual_dir); // <--- script_out = []; -- 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] r67937 - in /trunk/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn2.opensuse.org 16 Apr '12

16 Apr '12

Author: locilka Date: Mon Apr 16 13:45:24 2012 New Revision: 67937 URL: http://svn.opensuse.org/viewcvs/yast?rev=67937&view=rev Log: - UI refresh in searching for modified files optimized for faster machines (and disks) (BNC #756493). Modified: trunk/backup/package/yast2-backup.changes trunk/backup/src/ui.ycp Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Mon Apr 16 13:45:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 16 13:43:20 CEST 2012 - locilka(a)suse.com + +- UI refresh in searching for modified files optimized for faster + machines (and disks) (BNC #756493). + +------------------------------------------------------------------- Thu Mar 29 13:57:41 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=67937&r1=6… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Mon Apr 16 13:45:24 2012 @@ -1768,8 +1768,31 @@ } } +integer ui_last_refresh = 0; +integer ui_time_now = 0; + +/** + * Updates UI: Modified files size and count + */ +define void Search_UpdateFilesAndSize (integer & modified_size, integer & modified_num) { + # There's no UI in cron mode + if (Backup::cron_mode) + return; + + ui_time_now = time(); + + if (ui_time_now > ui_last_refresh) { + ui_last_refresh = ui_time_now; + + UI::ChangeWidget(`id(`totsize), `Value, + _("Total Size: ") + String::FormatSize (modified_size)); + UI::ChangeWidget(`id(`numfiles), `Value, + _("Modified Files: ") + sformat ("%1", modified_num)); + } +} + /** - * not sure + * Updates UI while searching for modified files */ define void Search_ModifiedFiles () { line = substring(line, size(id_file)); @@ -1778,11 +1801,7 @@ modified_size = modified_size + tointeger(size_str); modified_num = modified_num + 1; - if (!Backup::cron_mode) - { - UI::ChangeWidget(`id(`totsize), `Value, _("Total Size: ") + sformat("%1", String::FormatSize(modified_size))); - UI::ChangeWidget(`id(`numfiles), `Value, _("Modified Files: ") + sformat("%1", modified_num)); - } + Search_UpdateFilesAndSize(modified_size, modified_num); string found_file = substring(line, findfirstof(line, " ") + 1); @@ -1837,7 +1856,7 @@ reading_installed_packages = true; } else { if (line == id_files_read) { - if (Backup::cron_mode != true) { + if (!Backup::cron_mode) { SetDialogContents_SearchingForModifiedFiles(total_packages); UI::RecalcLayout(); } @@ -2019,6 +2038,27 @@ return `next; } +integer dir_last_refresh = 0; +integer dir_time_now = 0; +string dir_shown = ""; + +define void Search_ShowCurrentDir (string & actual_dir) { + // No update + if (dir_shown == actual_dir) + return; + + dir_time_now = time(); + + if (dir_time_now > dir_last_refresh) { + UI::ChangeWidget(`id(`directory), `Value, _("Searching in Directory: ") + actual_dir); + dir_last_refresh = dir_time_now; + dir_shown = actual_dir; + + // BNC#172406: Cannot be used for ncurses + if (!in_ncurses) UI::RecalcLayout(); + } +} + /** * Display progress of searching modified files in packages * @return symbol Symbol for wizard sequencer - pressed button @@ -2072,6 +2112,7 @@ Search_ChangedPackageFiles(); } else { if (substring(line, 0, size(id_file)) == id_file) { + ui_last_refresh = 0; Search_ModifiedFiles(); } else { if (line == id_nopackage) { @@ -2123,19 +2164,27 @@ // searching files not belonging to any package if (search_no_package) { string actual_dir = "/"; + + # Strings are not localized on purpose: Used for matching output from + # the searching script string id_readingall = "Reading all files"; string id_readall = "Files read"; string id_dir = "Dir: "; + # Chached value + integer size_id_dir = size(id_dir); + if (!Backup::cron_mode) { SetDialogContents_SearchingFiles(); } - integer dircount = 0; + ui_last_refresh = 0; list package_files_part = []; integer new_files = 0; + string dir_shown = ""; + while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) // test of script_out size is needed, because previous while cycle was interrupted and script could exited with no new output... { @@ -2156,12 +2205,7 @@ nopkg_num = nopkg_num + 1; - // refresh status when 10 new files was found - it's faster... - if (nopkg_num % 10 == 0 && Backup::cron_mode != true) - { - UI::ChangeWidget(`id(`totsize), `Value, _("Total Size: ") + String::FormatSize(nopkg_size)); - UI::ChangeWidget(`id(`numfiles), `Value, _("Modified Files: ") + sformat("%1", nopkg_num)); - } + Search_UpdateFilesAndSize(modified_size, modified_num); string found_file = substring(line, findfirstof(line, " ") + 1); @@ -2179,35 +2223,20 @@ new_files = new_files + 1; // merge more files in one step - it's faster - if (new_files == 1000) - { + if (new_files == 1000) { package_files = merge(package_files, package_files_part); package_files_part = []; new_files = 0; } - } - else - { - if (substring(line, 0, size(id_dir)) == id_dir) - { - dircount = dircount + 1; - - if (dircount == 5) - { - actual_dir = substring(line, size(id_dir)); - - if (!Backup::cron_mode) - { - UI::ChangeWidget(`id(`directory), `Value, _("Searching in Directory: ") + actual_dir); - // bug #172406 - // Cannot be used for ncurses - if (!in_ncurses) UI::RecalcLayout(); - } - - dircount = 0; + } else { + if (!Backup::cron_mode) { + if (substring (line, 0, size_id_dir) == id_dir) { + actual_dir = substring(line, size_id_dir); } } } + + Search_ShowCurrentDir (actual_dir); // <--- script_out = []; -- 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] r67936 - in /trunk/ftp-server: package/yast2-ftp-server.changes src/write_load.ycp
by jsrain＠svn2.opensuse.org 16 Apr '12

16 Apr '12

Author: jsrain Date: Mon Apr 16 09:14:56 2012 New Revision: 67936 URL: http://svn.opensuse.org/viewcvs/yast?rev=67936&view=rev Log: fixed reading of PureFTPD passive port range (bnc#756612) Modified: trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Mon Apr 16 09:14:56 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 16 07:13:41 UTC 2012 - jsrain(a)suse.cz + +- fixed reading of PureFTPD passive port range (bnc#756612) + +------------------------------------------------------------------- Thu Mar 29 14:56:18 CEST 2012 - jsuchome(a)suse.cz - merged proofed texts Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?re… ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Mon Apr 16 09:14:56 2012 @@ -561,7 +561,7 @@ return ""; else { if (haskey(FtpServer::PURE_SETTINGS, "PassivePortRange")) { - ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil," "); + ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil,":"); if (size(ports)==2) return ports[1]:""; } else { -- 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] r67935 - in /branches/SuSE-Code-11-SP2-Branch/ftp-server: package/yast2-ftp-server.changes src/write_load.ycp
by jsrain＠svn2.opensuse.org 16 Apr '12

16 Apr '12

Author: jsrain Date: Mon Apr 16 09:14:17 2012 New Revision: 67935 URL: http://svn.opensuse.org/viewcvs/yast?rev=67935&view=rev Log: fixed reading of PureFTPD passive port range (bnc#756612) Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes Mon Apr 16 09:14:17 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 16 07:13:41 UTC 2012 - jsrain(a)suse.cz + +- fixed reading of PureFTPD passive port range (bnc#756612) + +------------------------------------------------------------------- Mon Nov 28 15:37:02 CET 2011 - tgoettlicher(a)suse.de - backported fix for parsing options from xinetd (bnc#597842) Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp Mon Apr 16 09:14:17 2012 @@ -556,7 +556,7 @@ return ""; else { if (haskey(FtpServer::PURE_SETTINGS, "PassivePortRange")) { - ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil," "); + ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil,":"); if (size(ports)==2) return ports[1]:""; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0