April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46843 - in /trunk/autofs: VERSION package/yast2-autofs.changes src/Autofs.pm src/AutofsUI.ycp src/helps.ycp
by jsrain＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsrain Date: Fri Apr 18 15:16:58 2008 New Revision: 46843 URL: http://svn.opensuse.org/viewcvs/yast?rev=46843&view=rev Log: bump Modified: trunk/autofs/VERSION trunk/autofs/package/yast2-autofs.changes trunk/autofs/src/Autofs.pm trunk/autofs/src/AutofsUI.ycp trunk/autofs/src/helps.ycp Modified: trunk/autofs/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/VERSION?rev=46843&r1=4684… ============================================================================== --- trunk/autofs/VERSION (original) +++ trunk/autofs/VERSION Fri Apr 18 15:16:58 2008 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/package/yast2-autofs.chan… ============================================================================== --- trunk/autofs/package/yast2-autofs.changes (original) +++ trunk/autofs/package/yast2-autofs.changes Fri Apr 18 15:16:58 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 15:10:35 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread +- 2.15.4 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/autofs/src/Autofs.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/Autofs.pm?rev=46843&r… ============================================================================== --- trunk/autofs/src/Autofs.pm (original) +++ trunk/autofs/src/Autofs.pm Fri Apr 18 15:16:58 2008 @@ -221,7 +221,7 @@ if( $LDAPServer eq 'no' ) { y2milestone("------UNSUITABLE_LDAP_SERVER------"); - return YaPI->SetError( summary => __("The localhost can not be LDAP server for autofs."), + return YaPI->SetError( summary => __("The localhost cannot be LDAP server for autofs."), code => "UNSUITABLE_LDAP_SERVER" ); } } @@ -237,7 +237,7 @@ if( ! $success ) { y2milestone("------CAN_NOT_BIND_LDAP------"); - return YaPI->SetError( summary => __("Faild to bind to the LDAP server."), + return YaPI->SetError( summary => __("Failed to bind to the LDAP server."), code => "CAN_NOT_BIND_LDAP" ); } Modified: trunk/autofs/src/AutofsUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/AutofsUI.ycp?rev=4684… ============================================================================== --- trunk/autofs/src/AutofsUI.ycp (original) +++ trunk/autofs/src/AutofsUI.ycp Fri Apr 18 15:16:58 2008 @@ -21,7 +21,7 @@ `HSpacing (30), `RichText(`id(`HelpText), HELPS["GetLDAPServer"]:""), // text entry label - `TextEntry(`id(`ldapserver), _("DNS Name or IP-address of the LDAP-server"), hostname), + `TextEntry(`id(`ldapserver), _("DNS Name or IP address of the LDAP server"), hostname), `VSpacing(0.2), // ok pushbutton: confirm the dialog `HBox(`PushButton(`id(`ok), Label::OKButton()), Modified: trunk/autofs/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/helps.ycp?rev=46843&r… ============================================================================== --- trunk/autofs/src/helps.ycp (original) +++ trunk/autofs/src/helps.ycp Fri Apr 18 15:16:58 2008 @@ -37,7 +37,7 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing autofs Configuration</big> + "read" : _("Initializing autofs configuration Please wait... ") + @@ -47,22 +47,23 @@ "), /* Write dialog help 1/2 */ - "write" : _("<big>Saving autofs Configuration</big> + "write" : _("Saving autofs configuration Please wait... ") + /* Write dialog help 2/2 */ -_("<big>Aborting Saving:</big> +_("Aborting Saving: Abort the save procedure by pressing Abort. "), /* Configure dialog help 1/4 */ - "ConfigureDialog" : _("<big>Automounter Maps</big> + "ConfigureDialog" : _("Automounter Maps The automounter maps are maps referred to by the master map of the automounter. The automounter maps entries describe how file systems below the mountpoint of the map are to be mounted. - ") + + +") + /* Configure dialog help 2/4 */ _("<big>Key</big> @@ -72,8 +73,7 @@ /* Configure dialog help 3/4 */ _("<big>Options</big> -Options are optional. The options are a list of comma separated -options as customary for the mount(8) command. +The options are comma seperated, as customary for the mount(8) command. ") + @@ -87,32 +87,34 @@ /* EntryDialog for NFS entry */ "EntryDialogNFS" : _("<big>NFS Entry</big> -In case of NFS entry the Server is the DNS-name or IP-address of the NFS-server. -The Path is the absolute path of the directory on the NFS-server. +In case of NFS entry the Server is the DNS name or IP address of the NFS server. +The Path is the absolute path of the directory on the NFS server. The Options must be valid options of the mount(8) command for NFS file system. - "), + +"), /* EntryDialog for SAMBA entry */ - "EntryDialogSAMBA" : _("<big>SAMBA Entry</big> -In case of SAMBA entry the Server is the DNS-name or IP-address of the SAMBA-server. + "EntryDialogSAMBA" : _("SAMBA Entry +In case of the SAMBA entry the Server is the DNS name or IP address of the SAMBA server. The Share is the name of the share to be mounted. The Options must be valid options of the mount(8) command for SMB/CIFS file system - "), + +"), /* EntryDialog for Other entry */ "EntryDialogOther" : _("<big>Other Entry</big> -Options are optional. The options are a list of comma separated -options as customary for the mount(8) command. +The options are comma separated, as customary for the mount(8) command. The location specifies from where the file system is to be mounted. Please consult autofs(5) for more information. - "), + +"), /* GetLDAPServer dialog if the ldapserver is localhost */ "GetLDAPServer" : _("<big>Warning</big> -In your system localhost is configured as the LDAP-server. -But the localhost can not be LDAP-server for autofs because it can not achieved from the clients. -Please insert the IP-address or DNS-name of the LDAP-server suitable for the clients. -We have suggested the fully qualified hostname of your server. If it is good push OK. +In your system localhost is configured as the LDAP server. +However, the clients cannot reach the localhost and therefore, it cannot be the LDAP server for autofs. +Please insert an IP address or DNS name for the LDAP server that is suitable for the clients, or choose the suggested hostname of your server +and press Ok. "), ]; -- 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] r46842 - /tags/stable-2_16_10/iscsi-client/
by jsrain＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsrain Date: Fri Apr 18 15:05:38 2008 New Revision: 46842 URL: http://svn.opensuse.org/viewcvs/yast?rev=46842&view=rev Log: Created tag stable-2_16_10 for iscsi-client Added: tags/stable-2_16_10/iscsi-client/ - copied from r46841, trunk/iscsi-client/ -- 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] r46841 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp src/helps.ycp src/widgets.ycp
by jsrain＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsrain Date: Fri Apr 18 15:05:33 2008 New Revision: 46841 URL: http://svn.opensuse.org/viewcvs/yast?rev=46841&view=rev Log: merged texts from proofread Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/helps.ycp trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=46841&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Fri Apr 18 15:05:33 2008 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Fri Apr 18 15:05:33 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 14:37:28 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread +- 2.16.10 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Fri Apr 18 15:05:33 2008 @@ -281,7 +281,9 @@ sformat("grep -v '^#' %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { - Popup::Warning( _("InitiatorName from iBFT and from /etc/iscsi/initiatorname.iscsi are differ.\nOld initiatorname will be replaced by value from iBFT and create a backup.\nIf you want to use different initiatorname change it in BIOS.") ); + Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. +The old initiatorname will be replaced by the value of iBFT and create a backup. +If you want to use a different initiatorname, change it in the BIOS.") ); y2milestone("replacing old name %1 by name %2 from iBFT", initiatorname, name_from_bios); initiatorname = name_from_bios; ret = writeInitiatorName(initiatorname); Modified: trunk/iscsi-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/helps.ycp?rev=4… ============================================================================== --- trunk/iscsi-client/src/helps.ycp (original) +++ trunk/iscsi-client/src/helps.ycp Fri Apr 18 15:05:33 2008 @@ -74,19 +74,20 @@ "), // table of connected targets - "server_table" : _("List of current sessions. To add a new target, press Add. -To remove one, select it and press Log Out. -To change start-up status, press Toggle. + "server_table" : _("List of current sessions. To add a new target, select it and press Add. +To remove it, press Log Out. +To change the start-up status, press Toggle. ") + /* Warning */ _("<h1>Warning</h1>") + _("When accessing an iSCSI device READ/WRITE, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption. "), - "initiator_name" : _("InitiatorName is value from /etc/initiatorname.iscsi. In case you have iBFT this value will be replaced from there and you are not able to change it (do it in BIOS Setup)."), + "initiator_name" : _("InitiatorName is value a from <tt>/etc/initiatorname.iscsi</tt>. \nIn case you have iBFT, this value will be added from there and you are able to change it only in the BIOS setup."), - "isns" : _("If you want to use iSNS (Internet Storage Name Service) for discovering targets instead of default SendTargets method, -fill IP address of iSNS server and port. Default port should be 3205."), + "isns" : _("If you want to use iSNS (Internet Storage Name Service) for discovering targets instead of the default SendTargets method, +fill in the IP address of the iSNS server and port. The default port should be 3205. +"), // discovery new target "discovery" : _("<h1>iSCSI Initiator</h1>") + _("Enter the IP Address of the discovered server. Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Fri Apr 18 15:05:33 2008 @@ -24,7 +24,7 @@ integer sleep_step = 20; while (cont_loop && ((boolean) SCR::Read(.background.output_open))) { if (time_spent >= script_time_out) { - Popup::Error(_("Command timed-out")); + Popup::Error(_("Command timed out")); cont_loop = false; } time_spent = time_spent + sleep_step; @@ -186,12 +186,12 @@ string port = (string)UI::QueryWidget(`isns_port, `Value); if (size(address)==0 && size(port)==0) return true; if(!IP::Check4(address)){ - Popup::Error(_("Not valid IP address")); + Popup::Error(_("No valid IP address")); UI::SetFocus(`isns_address); return false; } if (size(port)==0){ - Popup::Error(_("Port field can't be empty")); + Popup::Error(_("Port field cannot be empty")); UI::SetFocus(`isns_port); return false; } @@ -261,8 +261,8 @@ boolean correct = regexpmatch(i_name, sformat("%1%2%3\$", reg1, reg2, reg3)); - if (!correct) Popup::Warning(_("Incorrect InitiatorName -Correct syntax is + if (!correct) Popup::Warning(_("Incorrect InitiatorName. +The correct syntax is iqn.yyyy-mm.reversed domain name[:identifier] Example: @@ -490,7 +490,7 @@ if ( event["ID"]:nil == `connect) { // check if not already connected if ( IscsiClientLib::connected( curr_rec , false) == true){ - if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; + if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } // goto ConnAuthDialog("discovered") (initDiscAuth) @@ -549,7 +549,7 @@ curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; // check if not already connected if ( IscsiClientLib::connected( curr_rec , false) == true){ - if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; + if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } // goto ConnAuthDialog("discovered") (initDiscAuth()) -- 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] r46840 - /trunk/ycp-ui-bindings/examples/SlideShowDemo2.ycp
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 14:55:38 2008 New Revision: 46840 URL: http://svn.opensuse.org/viewcvs/yast?rev=46840&view=rev Log: use existing icon Modified: trunk/ycp-ui-bindings/examples/SlideShowDemo2.ycp Modified: trunk/ycp-ui-bindings/examples/SlideShowDemo2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/SlideSh… ============================================================================== --- trunk/ycp-ui-bindings/examples/SlideShowDemo2.ycp (original) +++ trunk/ycp-ui-bindings/examples/SlideShowDemo2.ycp Fri Apr 18 14:55:38 2008 @@ -181,7 +181,7 @@ <table cellspacing=\"10\" cellpadding=\"5\"> \ <tr> \ <td width =\"*\"> \ -<img src=\"/opt/kde3/share/icons/crystalsvg/128x128/apps/kscd.png\" width=\"100\" \ +<img src=\"/usr/share/YaST2/theme/current/icons/48x48/apps/yast-sound.png\" \ align=\"left\"> \ </td> \ \ -- 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] r46839 - /tags/stable-2_16_28/users/
by jsuchome＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsuchome Date: Fri Apr 18 14:54:27 2008 New Revision: 46839 URL: http://svn.opensuse.org/viewcvs/yast?rev=46839&view=rev Log: Created tag stable-2_16_28 for users Added: tags/stable-2_16_28/users/ - copied from r46838, trunk/users/ -- 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] r46838 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/inst_user_first.ycp
by jsuchome＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: jsuchome Date: Fri Apr 18 14:54:21 2008 New Revision: 46838 URL: http://svn.opensuse.org/viewcvs/yast?rev=46838&view=rev Log: - correctly change the encryption type for root (bnc#371147) - 2.16.28 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/inst_user_first.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=46838&r1=46837… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Apr 18 14:54:21 2008 @@ -1 +1 @@ -2.16.27 +2.16.28 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Apr 18 14:54:21 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 14:48:08 CEST 2008 - jsuchome(a)suse.cz + +- correctly change the encryption type for root (bnc#371147) +- 2.16.28 + +------------------------------------------------------------------- Wed Apr 16 16:04:34 CEST 2008 - jsuchome(a)suse.cz - during 1st stage of installation import users only once Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=468… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Fri Apr 18 14:54:21 2008 @@ -54,8 +54,8 @@ my %max_pass_length = ( "local" => 72, - "system" => 8, - "ldap" => 8 + "system" => 72, + "ldap" => 72 ); @@ -251,6 +251,7 @@ $encryption_method = $method; if (defined $max_lengths{$encryption_method}) { $max_pass_length{"local"} = $max_lengths{$encryption_method}; + $max_pass_length{"system"} = $max_lengths{$encryption_method}; } } } Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Fri Apr 18 14:54:21 2008 @@ -368,8 +368,9 @@ foreach (string enc, string l, encoding2label, { UI::ChangeWidget (`id(enc),`Enabled, auth_method == "users"); }); - UI::ChangeWidget (`id (`import_ch), `Value, auth_method == "users" && - size (to_import) > 0); + if (size (to_import) > 0) + UI::ChangeWidget (`id (`import_ch), `Value, + auth_method == "users" && size (to_import) > 0); any retval = `cancel; while (true) { -- 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] r46837 - /tags/stable-2_16_35/packager/
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 14:45:22 2008 New Revision: 46837 URL: http://svn.opensuse.org/viewcvs/yast?rev=46837&view=rev Log: Created tag stable-2_16_35 for packager Added: tags/stable-2_16_35/packager/ - copied from r46836, trunk/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] r46836 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp yast2-packager.spec.in
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 14:45:14 2008 New Revision: 46836 URL: http://svn.opensuse.org/viewcvs/yast?rev=46836&view=rev Log: - Use Pkg::PkgMediaSizes() and Pkg::PkgMediaPackageSizes() for computing total install and download size instead of quering each selected package separately (speeds up the proposal summary from 15-20 seconds to less than 1 second) - this is also a workaround for broken disk usage in libzypp (bnc#375104) - 2.16.35 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=46836&r1=46… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Apr 18 14:45:14 2008 @@ -1 +1 @@ -2.16.34 +2.16.35 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 Fri Apr 18 14:45:14 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Apr 18 14:24:07 CEST 2008 - lslezak(a)suse.cz + +- Use Pkg::PkgMediaSizes() and Pkg::PkgMediaPackageSizes() for + computing total install and download size instead of quering + each selected package separately (speeds up the proposal summary + from 15-20 seconds to less than 1 second) +- this is also a workaround for broken disk usage in libzypp + (bnc#375104) +- 2.16.35 + +------------------------------------------------------------------- Wed Apr 16 13:37:41 CEST 2008 - locilka(a)suse.cz - Using pattern-xfce for XFCE Desktop selection (bnc #377584). Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Fri Apr 18 14:45:14 2008 @@ -150,35 +150,48 @@ */ global string CountSizeToBeInstalled () { integer sz = 0; - if (! Mode::installation () && !Installation::dirinstall_installing_into_dir ) - { - list<string> packages = Pkg::GetPackages (`selected, true); - foreach (string p, packages, { - sz = sz + Pkg::PkgSize (p); - }); - // convert into kB - sz = sz / 1024; - } - else // in case of fresh installation, disk is initially empty - { - map<string,list> du = Pkg::TargetGetDU (); - foreach (string mp, list usages, du, { - sz = sz + usages[2]:0 - usages[1]:0; - }); - } - y2milestone ("Total size of packages to install (kB): %1", sz); - return String::FormatSizeWithPrecision (sz*1024, 1, true); + list<list<integer> > media_sizes = Pkg::PkgMediaSizes(); + + foreach (list<integer> inst_sizes, media_sizes, + { + foreach (integer inst_size, inst_sizes, + { + sz = sz + inst_size; + } + ); + } + ); + + y2milestone ("Total size of packages to install %1 (%2kB)", sz, sz / 1024 ); + return String::FormatSizeWithPrecision (sz, 1, true); +} + +map<integer,integer> SrcMapping() +{ + map<integer,integer> srcid_to_current_src_no = $[]; + integer index = 0; + + list< list > src_list = Pkg::PkgMediaNames(); + y2debug("source names: %1", src_list); + + srcid_to_current_src_no = listmap( list src, src_list, { + index = index + 1; + return $[src[1]:-1 : index]; + }); + + y2milestone ("Repository mapping information: %1", srcid_to_current_src_no ); + return srcid_to_current_src_no; } /** * Count the total size of packages to be installed - * @return string formatted size of packages to be installed + * @return integer size of packages to be installed (in bytes) */ global integer CountSizeToBeDownloaded() { integer ret = 0; // get list of remote repositories - // consider only http and ftp protocols as remote + // consider only http(s) and ftp protocols as remote // all enabled sources list<integer> repos = Pkg::SourceGetCurrent(true); @@ -187,9 +200,9 @@ foreach(integer repo, repos, { string url = Pkg::SourceGeneralData(repo)["url"]:""; - string scheme = URL::Parse(url)["scheme"]:""; + string scheme = tolower(URL::Parse(url)["scheme"]:""); - if (tolower(scheme) == "http" || tolower(scheme) == "ftp") + if (scheme == "http" || scheme == "https" || scheme == "ftp") { y2milestone("Found remote repository %1: %2", repo, url); remote_repos = add(remote_repos, repo); @@ -204,28 +217,24 @@ return 0; } - list<string> packages = Pkg::GetPackages (`selected, true); + map<integer,integer> repo_mapping = SrcMapping(); + + list<list<integer> > media_sizes = Pkg::PkgMediaPackageSizes(); + y2debug("Media sizes: %1", media_sizes); - foreach (string p, packages, + foreach(integer repoid, remote_repos, { - list<map> properties = Pkg::ResolvableProperties(p, `package, ""); + list<integer> repo_media_sizes = media_sizes[(repo_mapping[repoid]:-1) - 1]:[]; - foreach(map prop, properties, + foreach(integer media_size, repo_media_sizes, { - // the package is selected for installation - if (prop["status"]:`unknown == `selected && contains(remote_repos, prop["source"]:-1)) - { - y2debug("Found remote package %1-%2 (%3) from repository %4", p, prop["version"]:"", prop["download_size"]:0, prop["source"]:-1); - - ret = ret + prop["download_size"]:0; - } + ret = ret + media_size; } ); } ); - y2milestone("Total size of packages to download: %1 (%2 B)", String::FormatSizeWithPrecision(ret, 1, true), ret); - + y2milestone("Total size of packages to download: %1 (%2kB)", ret, ret / 1024); return ret; } 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 Fri Apr 18 14:45:14 2008 @@ -7,8 +7,8 @@ # empty package callbacks BuildRequires: yast2 >= 2.16.52 -# new registration of callbacks -BuildRequires: yast2-pkg-bindings >= 2.16.23 +# Pkg::PkgMediaPackageSizes() +BuildRequires: yast2-pkg-bindings >= 2.16.29 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings @@ -17,8 +17,8 @@ Requires: yast2-country-data >= 2.16.3 Requires: yast2-installation >= 2.15.12 -# new registration of callbacks -Requires: yast2-pkg-bindings >= 2.16.23 +# Pkg::PkgMediaPackageSizes() +Requires: yast2-pkg-bindings >= 2.16.29 # empty package callbacks Requires: yast2 >= 2.16.52 -- 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] r46835 - /trunk/network/src/clients/dns.ycp
by mvidner＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: mvidner Date: Fri Apr 18 14:40:33 2008 New Revision: 46835 URL: http://svn.opensuse.org/viewcvs/yast?rev=46835&view=rev Log: thy name is dns Modified: trunk/network/src/clients/dns.ycp Modified: trunk/network/src/clients/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/dns.ycp?rev=… ============================================================================== --- trunk/network/src/clients/dns.ycp (original) +++ trunk/network/src/clients/dns.ycp Fri Apr 18 14:40:33 2008 @@ -87,7 +87,7 @@ map cmdline = $[ /* Commandline help title */ "help" : _("DNS Configuration"), - "id" : "routing", + "id" : "dns", "guihandler": DNSGUI, "initialize": DNS::Read, "finish" : DNS::Write, // FIXME -- 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] r46834 - /tags/stable-2_16_29/pkg-bindings/
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 14:37:57 2008 New Revision: 46834 URL: http://svn.opensuse.org/viewcvs/yast?rev=46834&view=rev Log: Created tag stable-2_16_29 for pkg-bindings Added: tags/stable-2_16_29/pkg-bindings/ - copied from r46833, trunk/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0