December 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r54334 - in /trunk/core: ./ agents-perl/lib/ycp.pm package/yast2-core.changes
by mvidner＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: mvidner Date: Mon Dec 22 14:45:57 2008 New Revision: 54334 URL: http://svn.opensuse.org/viewcvs/yast?rev=54334&view=rev Log: Merged revisions 54328 via svnmerge from http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-Branch/core Yes, I know I should use svn:mergeinfo from 1.5. Or even Git... ........ r54328 | mvidner | 2008-12-22 13:18:26 +0100 (Po, 22 pro 2008) | 3 lines Reverted r50800 which, in an attempt to fix another bug, encoded to UTF-8 once too many, breaking i18n going thru Perl agents (bnc#448217). ........ Modified: trunk/core/ (props changed) trunk/core/agents-perl/lib/ycp.pm trunk/core/package/yast2-core.changes Modified: trunk/core/agents-perl/lib/ycp.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agents-perl/lib/ycp.pm?rev=… ============================================================================== --- trunk/core/agents-perl/lib/ycp.pm (original) +++ trunk/core/agents-perl/lib/ycp.pm Mon Dec 22 14:45:57 2008 @@ -79,9 +79,6 @@ use Time::localtime; use Sys::Hostname; -# needed for printing character (>255) -binmode STDOUT, ':utf8'; - @ISA = qw(Exporter); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Dec 22 14:45:57 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 22 13:16:02 CET 2008 - mvidner(a)suse.cz + +- Reverted r50800 which, in an attempt to fix another bug, encoded to + UTF-8 once too many, breaking i18n going thru Perl agents (bnc#448217). + +------------------------------------------------------------------- Sat Dec 20 10:45:55 CET 2008 - aschnell(a)suse.de - added tosymbol builtin (bnc #192389) -- 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] r54333 - /trunk/storage/storage/src/include/custom_part_helptexts.ycp
by aschnell＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: aschnell Date: Mon Dec 22 14:40:13 2008 New Revision: 54333 URL: http://svn.opensuse.org/viewcvs/yast?rev=54333&view=rev Log: - removed some old helptexts Modified: trunk/storage/storage/src/include/custom_part_helptexts.ycp Modified: trunk/storage/storage/src/include/custom_part_helptexts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_helptexts.ycp (original) +++ trunk/storage/storage/src/include/custom_part_helptexts.ycp Mon Dec 22 14:40:13 2008 @@ -124,261 +124,6 @@ }; -define string getEditOrCreateHelptext(map new_val, boolean edit_format ) - ``{ - - string helptextCR = ""; - - if( edit_format ) - { - // help text, richtext format - helptextCR = _("On already-existing partitions, you can change -everything except the start and size of the partition."); - } - else - { - // helptext for popup create partition line 1 of 6 - helptextCR = _("First, choose the type of the partition and whether this partition should be formatted."); - // helptext for popup create partition line 2 of 6 - helptextCR = helptextCR + _("Then, enter the mount point ( /, /boot, /usr, /var, etc.)"); - - - if( !new_val["create"]:false ) - { - // helptext line 3 of 3 - helptextCR = helptextCR + _("To change the start or end cylinder, delete this partition then create a new one with the new parameters. All data on this partition will be lost."); - } - else - { - // helptext for popup create partition line 3 of 6 - helptextCR = helptextCR + _("Now, enter the location of the new partition on your hard disk. "); - // helptext for popup create partition line 4 of 6 - helptextCR = helptextCR + _("Please enter the starting cylinder number of the partition. "); - // helptext for popup create partition line 5 of 6 - helptextCR = helptextCR + _("After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66)."); - // helptext for popup create partition line 6 of 6 - helptextCR = helptextCR + _("It is also possible to specify the size of the partition directly (e.g., +100M or +20000K)."); - } - } - return( helptextCR ); - }; - - -define string getCreateEditExtendedHelptext() ``{ - - // helptext for popup create extended partition line - string helptextCR = _("Enter the starting cylinder number of the partition. -After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66). -It is also possible to specify the size of the partition directly (e.g., +2G, +100M, or +20000K). -"); - return( helptextCR ); - }; - - -define string getMainHelptext(boolean installation) - ``{ - string help_text = ""; - - // helptext expert partitioning. 1 - help_text = _(" Partition your hard disks... "); - - // helptext expert partitioning. 2 - help_text = help_text + _(" -This is intended for experts. -If you are not familiar with the concepts of hard disk partitions -and how to use them, you might want to go back and select automatic -partitioning. -"); - if( installation ) - { - // helptext expert partitioning. 3 - help_text = help_text + _(" -Please note that nothing will be written to your hard disk -until you confirm the entire installation in the last installation dialog. -Until that point, you can safely abort the installation. -"); - } - else - { - // helptext expert partitioning. 3 - help_text = help_text + _(" -Nothing will be written to your hard disk -until you confirm all your changes with the \"Apply\" button. -Until that point, you can safely abort. - -"); - } - - // helptext expert partitioning - help_text = help_text + _(" -For LVM setup, using a non-LVM boot partition is necessary. -Other than the boot partition, you should have partitions -managed by LVM. -"); - - // helptext expert partitioning. 4 - help_text = help_text + _(" -The table to the right shows the current partitions on all your hard disks. - -"); - - // helptext expert partitioning. 5 - help_text = help_text + _("Hard disks are designated like this ") + -// help text -_("<tt>/dev/sda </tt>1st disk -<tt>/dev/sdb </tt>2nd disk -<tt>/dev/sdc </tt>3rd disk") + -// help text -_("etc.")+ -// help text -_(" -This notation always refers to the entire disk. -"); - // helptext expert partitioning. 7 - help_text = help_text + _(" -Partitions are designated like this: -"); - // helptext expert partitioning. 8 - help_text = help_text + _("<tt>/dev/sda1 </tt>1st primary partition on the 1st disk.")+ - // helptext expert partitioning -_("<tt>/dev/sda2 </tt>2nd primary partition on the 1st disk.") + -"..." + - // helptext expert partitioning -_("<tt>/dev/sda5 </tt>1st logical partition within the extended partition on -the first disk. Note: this is always #5, even if there are less than four -primary partitions."); - // helptext expert partitioning. 9 - help_text = help_text + _("<tt>/dev/sda6 </tt>2nd logical partition")+ -"..."; - // helptext expert partitioning. 10 - help_text = help_text + _(" -On the i386 platform (i.e., normal PCs), there cannot be more than four -primary partitions on any hard disk, because the respective table in the -master boot record cannot contain more than four entries. - -"); - // helptext expert partitioning. 11 - help_text = help_text + _(" -Older PCs may have a BIOS limitation that restricts bootable -partitions to cylinders below 1024. - -"); - // helptext expert partitioning. 12 - help_text = help_text + _(" -If you have an older PC and want to boot from a partition, make sure it ends below this -1024 cylinder boundary. Create a separate partition and mount it as -/boot, if necessary. A partition consisting of one single cylinder -(at least 64 MB) is usually sufficient for that. - -"); - // helptext expert partitioning. 13 - help_text = help_text + _(" -One of the four primary partitions may be an extended partition. -This extended partition can contain one or more logical partitions. -"); - // helptext expert partitioning. 14 - help_text = help_text + _(" -The extended partition itself cannot hold any data. -To use its space, create logical partitions. -These logical partitions may contain any kind of Linux partition (Linux -file systems or Linux swap partition) or partitions for other -operating systems. - -"); - // helptext expert partitioning. 15 - help_text = help_text + _(" -In connection with advanced boot managers such as GRUB, you can even -boot your computer from a logical partition. -"); - // helptext expert partitioning. 16 - help_text = help_text + _(" -The extended partition will overlap with the logical -partitions: for an extended partition from cylinder 200 to 500, logical -partitions could range from, for example, 200 to 250, 251 to 400, and 401 to 500. - -"); - // helptext expert partitioning. 17 - help_text = help_text + _(" -An asterisk (*) after the mount point indicates a file system that is -currently not mounted (for example, because it has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>). - -"); - // helptext expert partitioning. 18 - help_text = help_text + _(" -The column labeled F contains flags. <tt>C</tt> means the partition is encrypted. -<tt>F</tt> means the partition is selected to be formatted. - -"); - // helptext expert partitioning. 19 - help_text = help_text + _(" -Used By tells if a device is used by LVM or RAID. If you do not use such -things, it is perfectly normal for this column to be empty. - -"); - // helptext expert partitioning. 20 - help_text = help_text + _(" -Mount By indicates how the file system is mounted: (K) by Kernel Name, -(L) by Label, (U) by UUID, (I) by Device ID, and (P) by Device Path. - -"); - - //help_text = help_text + "(.16)"; - - return( help_text ); - } - -define string getMainHelptextS390() - ``{ - string help_text = ""; - - // helptext S390 expert partitioning 1 - help_text = _(" -For a root file system on SCSI disks, add a /boot -partition on DASD to use for IPL. -"); - - // helptext S390 expert partitioning 2 - help_text = help_text + _(" -The table to the right shows the current partitions on all your hard disks. -Nothing will be written to your hard disk -until you confirm the entire installation in the last installation dialog. -Until that point, you can safely abort the installation."); - - // helptext S390 expert partitioning 3 - help_text = help_text + _(" -Hard disks are designated like this: -<tt>/dev/dasda </tt>First DASD disk -<tt>/dev/dasdb </tt>Second DASD disk -<tt>/dev/dasdc </tt>Third DASD disk -- or - -<tt>/dev/sda </tt>First SCSI disk -<tt>/dev/sdb </tt>Second SCSI disk -<tt>/dev/sdc </tt>Third SCSI disk"); - - // helptext S390 expert partitioning 4 - help_text = help_text + _(" -This notation always refers to the entire disk."); - - // helptext S390 expert partitioning 5 - help_text = help_text + _(" -If a DASD disk is selected for low level formatting -with the dasdfmt command, an <tt>X</tt> appears -in the third column of the line corresponding to the -disk. -"); - - // helptext S390 expert partitioning 6 - help_text = help_text + _(" -Partitions are designated like this: - -<tt>/dev/dasda1 </tt>First partition on the first DASD disk. -<tt>/dev/dasda2 </tt>Second partition on the first DASD disk. -<tt>/dev/dasda3 </tt>Third partition on the first DASD disk. -<tt>/dev/sda1</tt>, etc., for SCSI."); - - return( help_text ); - } - define string ia64_gpt_text() { return( _("Warning: With your current setup, your installation -- 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] r54332 - in /trunk/tune: hwinfo/src/system_settings_dialogs.ycp package/yast2-tune.changes
by lslezak＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: lslezak Date: Mon Dec 22 13:55:02 2008 New Revision: 54332 URL: http://svn.opensuse.org/viewcvs/yast?rev=54332&view=rev Log: - Kernel Setings - hide [Back] button in the main dialog (bnc#440555) Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp trunk/tune/package/yast2-tune.changes Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_… ============================================================================== --- trunk/tune/hwinfo/src/system_settings_dialogs.ycp (original) +++ trunk/tune/hwinfo/src/system_settings_dialogs.ycp Mon Dec 22 13:55:02 2008 @@ -208,7 +208,8 @@ "widget_names" : widget_names, "contents" : contents, "caption" : caption, - "back_button" : Label::BackButton(), + // hide back button + "back_button" : nil, "abort_button" : Label::CancelButton(), "next_button" : Label::OKButton(), ]); Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Mon Dec 22 13:55:02 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 22 13:54:12 CET 2008 - lslezak(a)suse.cz + +- Kernel Setings - hide [Back] button in the main dialog + (bnc#440555) + +------------------------------------------------------------------- Fri Oct 24 09:46:10 CEST 2008 - visnov(a)suse.cz - fix type error in accessing icons -- 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] r54331 - /tags/branch-Code-11-2_17_26/core/
by mvidner＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: mvidner Date: Mon Dec 22 13:41:07 2008 New Revision: 54331 URL: http://svn.opensuse.org/viewcvs/yast?rev=54331&view=rev Log: Created tag branch-Code-11-2_17_26 for core Added: tags/branch-Code-11-2_17_26/core/ - copied from r54330, branches/SuSE-Code-11-Branch/core/ -- 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] r54330 - /tags/branch-Code-11-2_17_26/
by mvidner＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: mvidner Date: Mon Dec 22 13:41:05 2008 New Revision: 54330 URL: http://svn.opensuse.org/viewcvs/yast?rev=54330&view=rev Log: Created tag branch-Code-11-2_17_26 Added: tags/branch-Code-11-2_17_26/ -- 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] r54329 - /trunk/core/
by mvidner＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: mvidner Date: Mon Dec 22 13:27:17 2008 New Revision: 54329 URL: http://svn.opensuse.org/viewcvs/yast?rev=54329&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-54122" from http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-Branch/core Modified: trunk/core/ (props changed) -- 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] r54328 - in /branches/SuSE-Code-11-Branch/core: VERSION agents-perl/lib/ycp.pm package/yast2-core.changes
by mvidner＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: mvidner Date: Mon Dec 22 13:18:26 2008 New Revision: 54328 URL: http://svn.opensuse.org/viewcvs/yast?rev=54328&view=rev Log: Reverted r50800 which, in an attempt to fix another bug, encoded to UTF-8 once too many, breaking i18n going thru Perl agents (bnc#448217). Modified: branches/SuSE-Code-11-Branch/core/VERSION branches/SuSE-Code-11-Branch/core/agents-perl/lib/ycp.pm branches/SuSE-Code-11-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/VERS… ============================================================================== --- branches/SuSE-Code-11-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-Branch/core/VERSION Mon Dec 22 13:18:26 2008 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: branches/SuSE-Code-11-Branch/core/agents-perl/lib/ycp.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agents-perl/lib/ycp.pm (original) +++ branches/SuSE-Code-11-Branch/core/agents-perl/lib/ycp.pm Mon Dec 22 13:18:26 2008 @@ -79,9 +79,6 @@ use Time::localtime; use Sys::Hostname; -# needed for printing character (>255) -binmode STDOUT, ':utf8'; - @ISA = qw(Exporter); Modified: branches/SuSE-Code-11-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/pack… ============================================================================== --- branches/SuSE-Code-11-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-Branch/core/package/yast2-core.changes Mon Dec 22 13:18:26 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 22 13:16:02 CET 2008 - mvidner(a)suse.cz + +- Reverted r50800 which, in an attempt to fix another bug, encoded to + UTF-8 once too many, breaking i18n going thru Perl agents (bnc#448217). +- 2.17.26 + +------------------------------------------------------------------- Thu Dec 11 15:06:31 CET 2008 - lslezak(a)suse.cz - tty_wrapper - fixed a deadlock in tty setting (set the terminal -- 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] r54327 - in /branches/SuSE-Code-11-Branch/yast2: library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: lslezak Date: Mon Dec 22 13:17:02 2008 New Revision: 54327 URL: http://svn.opensuse.org/viewcvs/yast?rev=54327&view=rev Log: - PackageCallbacks.ycp - do not log a password in URL (bnc#460978) Modified: branches/SuSE-Code-11-Branch/yast2/library/packages/src/PackageCallbacks.ycp branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-Branch/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/lib… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ branches/SuSE-Code-11-Branch/yast2/library/packages/src/PackageCallbacks.ycp Mon Dec 22 13:17:02 2008 @@ -723,7 +723,7 @@ } y2milestone ("MediaChange error: err'%1', url'%2', prd'%3', cur'%4'/'%5', wan'%6'/'%7', devs: %8, curr_dev: %9", - error_code + ":" + error, url, product, current, current_label, wanted, wanted_label, devices, current_device); + error_code + ":" + error, URL::HidePassword(url), product, current, current_label, wanted, wanted_label, devices, current_device); map url_tokens = URL::Parse (url); string url_scheme = url_tokens["scheme"]:""; @@ -932,7 +932,7 @@ return "S"; } - y2internal("Opening Dialog: %1", LayoutPopup (message, button_box, 10, true)); + y2debug("Opening Dialog: %1", LayoutPopup (message, button_box, 10, true)); if ( showLongInfo ) { @@ -1092,7 +1092,7 @@ if (r == `url) { - y2milestone("Redirecting to: %1", url); + y2milestone("Redirecting to: %1", URL::HidePassword(url)); return url; } @@ -1153,7 +1153,7 @@ if (ret != msg) { - y2milestone("URL conversion: '%1' converted to '%2'", msg, ret); + y2milestone("URL conversion: '%1' converted to '%2'", URL::HidePassword(msg), URL::HidePassword(ret)); } return ret; @@ -1290,7 +1290,7 @@ } global symbol SourceCreateError (string url, symbol error, string description) { - y2milestone ("Source create: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source create: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details string message = _("Error occurred while creating the repository."); @@ -1311,7 +1311,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(url); + CommandLine::Print(URL::HidePassword(url)); CommandLine::Print(description); // ask user in the interactive mode @@ -1352,17 +1352,17 @@ // set 100% progress SourcePopupSetProgress(100); - y2milestone ("Source create end: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source create end: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); } global void SourceProbeStart(string url) { - y2milestone ("SourceProbeStart: %1", url); + y2milestone ("SourceProbeStart: %1", URL::HidePassword(url)); // popup label (%1 is repository URL) - string msg = sformat(_("Probing Repository %1"), url); + string msg = sformat(_("Probing Repository %1"), URL::HidePassword(url)); if (Mode::commandline()) { CommandLine::Print(msg); @@ -1371,7 +1371,7 @@ { OpenSourcePopup(); - string msg = sformat(_("Probing Repository %1"), url); + string msg = sformat(_("Probing Repository %1"), URL::HidePassword(url)); if (_source_open == 1) { @@ -1387,12 +1387,12 @@ global void SourceProbeFailed(string url, string type) { - y2milestone("Repository %1 is not %2 repository", url, type); + y2milestone("Repository %1 is not %2 repository", URL::HidePassword(url), type); } global void SourceProbeSucceeded(string url, string type) { - y2milestone("Repository %1 is type %2", url, type); + y2milestone("Repository %1 is type %2", URL::HidePassword(url), type); } @@ -1403,7 +1403,7 @@ global symbol SourceProbeError(string url, symbol error, string description) { - y2milestone ("Source probe: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source probe: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details string message = _("Error occurred while probing the repository."); @@ -1427,7 +1427,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(url); + CommandLine::Print(URL::HidePassword(url)); CommandLine::Print(description); // ask user in the interactive mode @@ -1466,13 +1466,13 @@ CloseSourcePopup(); CloseSourcePopup(); - y2milestone ("Source probe end: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source probe end: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); } global void SourceReportStart(integer source_id, string url, string task) { - y2milestone("Source report start: src: %1, URL: %2, task: %3", source_id, url, task); + y2milestone("Source report start: src: %1, URL: %2, task: %3", source_id, URL::HidePassword(url), task); if (Mode::commandline()) { CommandLine::Print(task); @@ -1502,7 +1502,7 @@ global symbol SourceReportError(integer source_id, string url, symbol error, string description) { - y2milestone ("Source report: error: id: %1, url: %2, error: %3, description: %4", source_id, url, error, description); + y2milestone ("Source report: error: id: %1, url: %2, error: %3, description: %4", source_id, URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details string message = sformat(_("Repository %1"), url); @@ -1558,7 +1558,7 @@ global void SourceReportEnd(integer src_id, string url, string task, symbol error, string description) { - y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, url, task, error, description); + y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, URL::HidePassword(url), task, error, description); // set 100% progress SourcePopupSetProgress(100); @@ -1778,7 +1778,7 @@ Label::IgnoreButton(), /*retry_button_message*/ `retry /*symbol focus*/ ); - y2internal("Problem result: %1", ui); + y2milestone("Problem result: %1", ui); // Abort is the default string ret = "A"; @@ -1927,13 +1927,13 @@ global void StartDownload (string url, string localfile) { - y2milestone("Downloading %1 to %2", url, localfile); + y2milestone("Downloading %1 to %2", URL::HidePassword(url), localfile); // heading of popup string heading = _("Downloading"); // reformat the URL - string url_report = URL::FormatURL(URL::Parse(url), max_size); + string url_report = URL::FormatURL(URL::Parse(URL::HidePassword(url)), max_size); // remember the URL download_file = url_report; Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Mon Dec 22 13:17:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 22 13:02:28 CET 2008 - lslezak(a)suse.cz + +- PackageCallbacks.ycp - do not log a password in URL (bnc#460978) + +------------------------------------------------------------------- Wed Dec 17 14:16:19 CET 2008 - locilka(a)suse.cz - Escaping parameters when calling /usr/bin/genDDNSkey -- 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] r54326 - in /trunk/yast2: library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: lslezak Date: Mon Dec 22 13:09:17 2008 New Revision: 54326 URL: http://svn.opensuse.org/viewcvs/yast?rev=54326&view=rev Log: - PackageCallbacks.ycp - do not log a password in URL (bnc#460978) Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Mon Dec 22 13:09:17 2008 @@ -723,7 +723,7 @@ } y2milestone ("MediaChange error: err'%1', url'%2', prd'%3', cur'%4'/'%5', wan'%6'/'%7', devs: %8, curr_dev: %9", - error_code + ":" + error, url, product, current, current_label, wanted, wanted_label, devices, current_device); + error_code + ":" + error, URL::HidePassword(url), product, current, current_label, wanted, wanted_label, devices, current_device); map url_tokens = URL::Parse (url); string url_scheme = url_tokens["scheme"]:""; @@ -932,7 +932,7 @@ return "S"; } - y2internal("Opening Dialog: %1", LayoutPopup (message, button_box, 10, true)); + y2debug("Opening Dialog: %1", LayoutPopup (message, button_box, 10, true)); if ( showLongInfo ) { @@ -1092,7 +1092,7 @@ if (r == `url) { - y2milestone("Redirecting to: %1", url); + y2milestone("Redirecting to: %1", URL::HidePassword(url)); return url; } @@ -1153,7 +1153,7 @@ if (ret != msg) { - y2milestone("URL conversion: '%1' converted to '%2'", msg, ret); + y2milestone("URL conversion: '%1' converted to '%2'", URL::HidePassword(msg), URL::HidePassword(ret)); } return ret; @@ -1290,7 +1290,7 @@ } global symbol SourceCreateError (string url, symbol error, string description) { - y2milestone ("Source create: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source create: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details string message = _("Error occurred while creating the repository."); @@ -1311,7 +1311,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(url); + CommandLine::Print(URL::HidePassword(url)); CommandLine::Print(description); // ask user in the interactive mode @@ -1352,17 +1352,17 @@ // set 100% progress SourcePopupSetProgress(100); - y2milestone ("Source create end: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source create end: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); } global void SourceProbeStart(string url) { - y2milestone ("SourceProbeStart: %1", url); + y2milestone ("SourceProbeStart: %1", URL::HidePassword(url)); // popup label (%1 is repository URL) - string msg = sformat(_("Probing Repository %1"), url); + string msg = sformat(_("Probing Repository %1"), URL::HidePassword(url)); if (Mode::commandline()) { CommandLine::Print(msg); @@ -1371,7 +1371,7 @@ { OpenSourcePopup(); - string msg = sformat(_("Probing Repository %1"), url); + string msg = sformat(_("Probing Repository %1"), URL::HidePassword(url)); if (_source_open == 1) { @@ -1387,12 +1387,12 @@ global void SourceProbeFailed(string url, string type) { - y2milestone("Repository %1 is not %2 repository", url, type); + y2milestone("Repository %1 is not %2 repository", URL::HidePassword(url), type); } global void SourceProbeSucceeded(string url, string type) { - y2milestone("Repository %1 is type %2", url, type); + y2milestone("Repository %1 is type %2", URL::HidePassword(url), type); } @@ -1403,7 +1403,7 @@ global symbol SourceProbeError(string url, symbol error, string description) { - y2milestone ("Source probe: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source probe: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details string message = _("Error occurred while probing the repository."); @@ -1427,7 +1427,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(url); + CommandLine::Print(URL::HidePassword(url)); CommandLine::Print(description); // ask user in the interactive mode @@ -1466,13 +1466,13 @@ CloseSourcePopup(); CloseSourcePopup(); - y2milestone ("Source probe end: error: url: %1, error: %2, description: %3", url, error, description); + y2milestone ("Source probe end: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); } global void SourceReportStart(integer source_id, string url, string task) { - y2milestone("Source report start: src: %1, URL: %2, task: %3", source_id, url, task); + y2milestone("Source report start: src: %1, URL: %2, task: %3", source_id, URL::HidePassword(url), task); if (Mode::commandline()) { CommandLine::Print(task); @@ -1502,7 +1502,7 @@ global symbol SourceReportError(integer source_id, string url, symbol error, string description) { - y2milestone ("Source report: error: id: %1, url: %2, error: %3, description: %4", source_id, url, error, description); + y2milestone ("Source report: error: id: %1, url: %2, error: %3, description: %4", source_id, URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details string message = sformat(_("Repository %1"), url); @@ -1558,7 +1558,7 @@ global void SourceReportEnd(integer src_id, string url, string task, symbol error, string description) { - y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, url, task, error, description); + y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, URL::HidePassword(url), task, error, description); // set 100% progress SourcePopupSetProgress(100); @@ -1778,7 +1778,7 @@ Label::IgnoreButton(), /*retry_button_message*/ `retry /*symbol focus*/ ); - y2internal("Problem result: %1", ui); + y2milestone("Problem result: %1", ui); // Abort is the default string ret = "A"; @@ -1927,13 +1927,13 @@ global void StartDownload (string url, string localfile) { - y2milestone("Downloading %1 to %2", url, localfile); + y2milestone("Downloading %1 to %2", URL::HidePassword(url), localfile); // heading of popup string heading = _("Downloading"); // reformat the URL - string url_report = URL::FormatURL(URL::Parse(url), max_size); + string url_report = URL::FormatURL(URL::Parse(URL::HidePassword(url)), max_size); // remember the URL download_file = url_report; 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 Mon Dec 22 13:09:17 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 22 13:02:28 CET 2008 - lslezak(a)suse.cz + +- PackageCallbacks.ycp - do not log a password in URL (bnc#460978) + +------------------------------------------------------------------- Wed Dec 17 14:35:22 CET 2008 - lslezak(a)suse.cz - PackageSystem::DoInstallAndRemove() - check the system and offer -- 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] r54325 - in /trunk/core/libycp: src/YCPBuiltinSymbol.cc testsuite/tests/builtin/Builtin-Symbol.err testsuite/tests/builtin/Builtin-Symbol.out testsuite/tests/builtin/Builtin-Symbol.ycp
by aschnell＠svn.opensuse.org 22 Dec '08

22 Dec '08

Author: aschnell Date: Mon Dec 22 12:48:13 2008 New Revision: 54325 URL: http://svn.opensuse.org/viewcvs/yast?rev=54325&view=rev Log: - removed conversion of integer to symbol again - it's plain wrong since `1 is not valid Modified: trunk/core/libycp/src/YCPBuiltinSymbol.cc trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Modified: trunk/core/libycp/src/YCPBuiltinSymbol.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinSymbol… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinSymbol.cc (original) +++ trunk/core/libycp/src/YCPBuiltinSymbol.cc Mon Dec 22 12:48:13 2008 @@ -33,10 +33,9 @@ static YCPValue -s_tosymbol1 (const YCPString& v) +s_tosymbol (const YCPString& v) { /* @builtin tosymbol - * @id tosymbol-string * @short Converts a string to a symbol. * * @param string VALUE @@ -49,29 +48,11 @@ } -static YCPValue -s_tosymbol2 (const YCPInteger& v) -{ - /* @builtin tosymbol - * @id tosymbol-integer - * @short Converts a integer to a symbol. - * - * @param string VALUE - * @return symbol - * - * @usage tosymbol(69) -> `69 - */ - - return YCPSymbol(v->toString()); -} - - YCPBuiltinSymbol::YCPBuiltinSymbol () { // must be static, registerDeclarations saves a pointer to it! static declaration_t declarations[] = { - { "tosymbol", "symbol (const string)", (void*) s_tosymbol1 }, - { "tosymbol", "symbol (const integer)", (void*) s_tosymbol2 }, + { "tosymbol", "symbol (const string)", (void*) s_tosymbol }, { 0 } }; Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err Mon Dec 22 12:48:13 2008 @@ -8,10 +8,6 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- -tosymbol (69) ----------------------------------------------------------------------- -Parsed: ----------------------------------------------------------------------- tosymbol (nil) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-Symbol.ycp:15 Argument (nil) to tosymbol(...) is nil +[Interpreter] tests/builtin/Builtin-Symbol.ycp:14 Argument (nil) to tosymbol(...) is nil Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out Mon Dec 22 12:48:13 2008 @@ -1,4 +1,3 @@ ("** tosymbol **") (`test) -(`69) (nil) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Mon Dec 22 12:48:13 2008 @@ -11,6 +11,5 @@ ("** tosymbol **") (tosymbol ("test")) -(tosymbol (69)) (tosymbol (nil)) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0