May 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r68103 - /tags/stable-2_22_3/samba-server/
by jsuchome＠svn2.opensuse.org 09 May '12

09 May '12

Author: jsuchome Date: Wed May 9 10:25:28 2012 New Revision: 68103 URL: http://svn.opensuse.org/viewcvs/yast?rev=68103&view=rev Log: Created tag stable-2_22_3 for samba-server Added: tags/stable-2_22_3/samba-server/ - copied from r68102, trunk/samba-server/ -- 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] r68102 - in /trunk/samba-server: VERSION package/yast2-samba-server.changes users-plugin/UsersPluginSamba.pm
by jsuchome＠svn2.opensuse.org 09 May '12

09 May '12

Author: jsuchome Date: Wed May 9 10:25:11 2012 New Revision: 68102 URL: http://svn.opensuse.org/viewcvs/yast?rev=68102&view=rev Log: - enhanced check for password requirement in Users plugin - 2.22.3 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/users-plugin/UsersPluginSamba.pm Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=68102&r… ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Wed May 9 10:25:11 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Wed May 9 10:25:11 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 9 10:19:43 CEST 2012 - jsuchome(a)suse.cz + +- enhanced check for password requirement in Users plugin +- 2.22.3 + +------------------------------------------------------------------- Thu Mar 29 15:56:35 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/samba-server/users-plugin/UsersPluginSamba.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/UsersP… ============================================================================== --- trunk/samba-server/users-plugin/UsersPluginSamba.pm (original) +++ trunk/samba-server/users-plugin/UsersPluginSamba.pm Wed May 9 10:25:11 2012 @@ -288,7 +288,8 @@ if( ! $data->{'sambainternal'}->{'initialized'} ) { $self->init_internal_keys( $config, $data ); $data->{'sambainternal'}->{'initialized'} = 1; - } elsif ( (! $data->{'sambaLMPassword'}) && + } elsif ( (! $data->{'sambaLMPassword'}) && + (! $data->{'sambaNTPassword'}) && ( (! $data->{'text_userpassword'} ) || ($data->{'text_userpassword'} eq "" )) ){ $error = __("Change the password to create the Samba account"); return undef; @@ -301,7 +302,8 @@ } $self->update_attributes ($config, $data); - if ( (! $data->{'sambaLMPassword'}) ) { + if ( (! $data->{'sambaLMPassword'}) && + (! $data->{'sambaNTPassword'}) ) { y2debug ("no samba password hashes present yet"); } -- 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] r68101 - /trunk/printer/src/
by jsmeix＠svn2.opensuse.org 09 May '12

09 May '12

Author: jsmeix Date: Wed May 9 09:30:04 2012 New Revision: 68101 URL: http://svn.opensuse.org/viewcvs/yast?rev=68101&view=rev Log: Fixed Bug 732271: Update HTTP URLs Modified: trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/dialogs.ycp trunk/printer/src/driveradd.ycp trunk/printer/src/driveroptions.ycp trunk/printer/src/overview.ycp trunk/printer/src/printer_proposal.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/src/readwrite.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6810… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed May 9 09:30:04 2012 @@ -721,7 +721,7 @@ /** * Initialize printer configuration (checks only the installed packages) see - * http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implement…: + * http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: * for background information * @return true on success */ @@ -777,7 +777,7 @@ /** * Finish printer configuration (does actually nothing except to exit verbosely) see - * http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implement…: + * http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: * for background information * @return true in any case (because it only exits) */ Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=681… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed May 9 09:30:04 2012 @@ -268,14 +268,14 @@ ) ) ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) // because it reads "Cancel - Closes the window and returns to the overview." // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( caption, contents, Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Wed May 9 09:30:04 2012 @@ -439,14 +439,14 @@ ) ) ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) // because it reads "Cancel - Closes the window and returns to the overview." // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( caption, contents, Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Wed May 9 09:30:04 2012 @@ -2024,7 +2024,7 @@ ) ) ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -2033,7 +2033,7 @@ // from which this DriverOptionsDialog was called i.e. BasicModifyDialog. // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( // TRANSLATORS: Connection wizard header _("Connection Wizard"), Modified: trunk/printer/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/dialogs.ycp?rev=6810… ============================================================================== --- trunk/printer/src/dialogs.ycp (original) +++ trunk/printer/src/dialogs.ycp Wed May 9 09:30:04 2012 @@ -125,8 +125,7 @@ "screens" : tabs_description, "widget_descr" : widgets_handling, // All the dialogs in "ids_order" are single (step) configuration dialogs - // and according to the new YaST style guide at - // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // and according to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -183,8 +182,7 @@ "screens" : AutoDialog_tabs_description, "widget_descr" : AutoDialog_widgets_handling, // All the dialogs in "ids_order" are single (step) configuration dialogs - // and according to the new YaST style guide at - // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // and according to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=68… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Wed May 9 09:30:04 2012 @@ -197,7 +197,7 @@ ), `VStretch() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -206,7 +206,7 @@ // from which this AddDriverDialog was called i.e. BasicAddDialog or BasicModifyDialog. // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( caption, contents, Modified: trunk/printer/src/driveroptions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveroptions.ycp?re… ============================================================================== --- trunk/printer/src/driveroptions.ycp (original) +++ trunk/printer/src/driveroptions.ycp Wed May 9 09:30:04 2012 @@ -64,7 +64,7 @@ // because no value is initially selected: Printer::DriverOptionItems( "", "" ) ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -73,7 +73,7 @@ // from which this DriverOptionsDialog was called i.e. BasicModifyDialog. // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( caption, contents, Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=681… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Wed May 9 09:30:04 2012 @@ -355,8 +355,7 @@ symbol handleOverview( string key, map event ) { y2milestone( "entering handleOverview with key '%1'\nand event '%2'", key, event ); // In the Overview dialog it does not make sense to have a button with "back" functionality - // which is named "Cancel" according to the new YaST style guide at - // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // which is named "Cancel" according to the YaST Style Guide (dated Thu, 06 Nov 2008) // because there is nothing to "cancel" in the Overview dialog because it // only shows information about the current state of the configuration // but the Overview dialog itself does not do any change of the configuration. @@ -367,7 +366,7 @@ // If the user accepted in such a configuration sub-dialog what he changed // via the "OK" button there, the change is applied and the Overview dialog // shows the new current state of the configuration, see - // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implement…: + // http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: // so that it is not possible to "cancel" the change in the Overview dialog. // Any change of the configuration is done in sub-dialogs which are called // from the Overview dialog (even the "Confirm Deletion" popup is such a sub-dialog) @@ -398,8 +397,7 @@ ) { Wizard::RestoreBackButton(); // The above RestoreBackButton restores also its label to the default "Back" - // but according to the new YaST style guide at - // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // but according to the YaST Style Guide (dated Thu, 06 Nov 2008) // this button is now named "Cancel": Wizard::SetBackButton( `back, Label::CancelButton() ); } Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp… ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Wed May 9 09:30:04 2012 @@ -350,7 +350,7 @@ else if(func == "Write") { // There is no need to call Printer::Write() here because // it does actually nothing except to exit verbosely, see - // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implement…: + // http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: // for background information. y2milestone("No need to call Printer::Write() because it does nothing."); } Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Wed May 9 09:30:04 2012 @@ -390,7 +390,7 @@ // are also disabled, there is no need to start the local cupsd in this dialog. // Other dialogs are on their own to start the local cupsd if needed, // see the "Different Workflow What Actually Happens" section at - // http://en.opensuse.org/YaST/Development/Printer_Enhancement + // http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: } // When handling both BrowseAllow and BrowsePoll // the cupsd may need to be started or restarted in both cases. @@ -575,7 +575,7 @@ // does not require a running cupsd. // Other dialogs are on their own to start the local cupsd if needed, // see the "Different Workflow What Actually Happens" section at - // http://en.opensuse.org/YaST/Development/Printer_Enhancement + // http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: if( Printerlib::GetAndSetCupsdStatus( "" ) ) { if( ! Printerlib::GetAndSetCupsdStatus( "restart" ) ) { return false; Modified: trunk/printer/src/readwrite.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/readwrite.ycp?rev=68… ============================================================================== --- trunk/printer/src/readwrite.ycp (original) +++ trunk/printer/src/readwrite.ycp Wed May 9 09:30:04 2012 @@ -63,7 +63,7 @@ * (e.g. set up share print queues but don't re-start the cupsd). * At present all what is needed for one setup is committed to the system instantly. * For background information and details see - * http://en.opensuse.org/YaST/Development/Printer_Enhancement + * http://en.opensuse.org/Archive:YaST_Printer_redesign * @return true if nothing was committed or if user confirms to abort */ boolean ReallyAbort() @@ -84,7 +84,7 @@ // Otherwise the user is asked for confirmation whether he want's to continue // despite the fact that the module might not work correctly. if( !Confirm::MustBeRoot() ) return `abort; - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Thu, 06 Nov 2008) // the "abort" button in a single configuration dialog must now be named "cancel": Wizard::SetAbortButton( `abort, Label::CancelButton() ); // No "back" or "next" button at all makes any sense here -- 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] r68100 - in /trunk/printer: VERSION src/Printer.ycp src/sharing.ycp
by jsmeix＠svn2.opensuse.org 08 May '12

08 May '12

Author: jsmeix Date: Tue May 8 16:40:19 2012 New Revision: 68100 URL: http://svn.opensuse.org/viewcvs/yast?rev=68100&view=rev Log: Fixed Bug 701263: Use ButtonBox widget in yast2-printer. Fixed Bug 748884: Printer.ycp DownloadProgress error. Modified: trunk/printer/VERSION trunk/printer/src/Printer.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=68100&r1=680… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue May 8 16:40:19 2012 @@ -1 +1 @@ -2.21.0 +2.23.0 Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6810… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Tue May 8 16:40:19 2012 @@ -380,9 +380,9 @@ boolean progress_feedback = UI::HasSpecialWidget( `DownloadProgress ); if( progress_feedback ) { // Show nice self-updating feedback: - // Empty an existing database file so that the DownloadProgress starts at the beginning. + // Empty an existing progress file so that the DownloadProgress starts at the beginning. // Don't care if this command is successful. All what matters is if CreateDatabase() works. - Printerlib::ExecuteBashCommand( "cat /dev/null >" + database_filename ); + Printerlib::ExecuteBashCommand( "cat /dev/null >" + create_database_progress_filename ); UI::OpenDialog( `MinSize( 60, 3, `ReplacePoint( `id(`create_database_progress_replace_point), `DownloadProgress( // Header of a DownloadProgress indicator: Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=6810… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Tue May 8 16:40:19 2012 @@ -214,7 +214,7 @@ available_interfaces ), `VSpacing(), - `HBox + `ButtonBox ( `PushButton( `id(`ok), Label::OKButton() ), `PushButton( `id(`cancel), Label::CancelButton() ) ) -- 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] r68099 - in /trunk/scanner: VERSION package/yast2-scanner.changes src/Scanner.ycp src/dialogs.ycp src/helps.ycp
by jsmeix＠svn2.opensuse.org 08 May '12

08 May '12

Author: jsmeix Date: Tue May 8 15:25:22 2012 New Revision: 68099 URL: http://svn.opensuse.org/viewcvs/yast?rev=68099&view=rev Log: - V 2.23.0 - Third party driver "epkowa" responsibility transferred from Avasys to Epson (bnc#746038). - Use ButtonBox widget in src/Scanner.ycp (bnc#701263). - Fixed typo in help text "UDB" -> "USB" (bnc#703235). - Replaced the HTTP URLs to the Style Guide with the plain text "YaST Style Guide (dated Tue, 04 Nov 2008)" (bnc#732272). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/src/dialogs.ycp trunk/scanner/src/helps.ycp Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=68099&r1=680… ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Tue May 8 15:25:22 2012 @@ -1 +1 @@ -2.20.2 +2.23.0 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Tue May 8 15:25:22 2012 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue May 8 15:14:57 CEST 2012 - jsmeix(a)suse.de + +- V 2.23.0 +- Third party driver "epkowa" responsibility transferred + from Avasys to Epson (bnc#746038). +- Use ButtonBox widget in src/Scanner.ycp (bnc#701263). +- Fixed typo in help text "UDB" -> "USB" (bnc#703235). +- Replaced the HTTP URLs to the Style Guide with the plain text + "YaST Style Guide (dated Tue, 04 Nov 2008)" (bnc#732272). + +------------------------------------------------------------------- Thu Mar 29 15:58:34 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=6809… ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Tue May 8 15:25:22 2012 @@ -390,20 +390,23 @@ { // First of all the multi-line string because such strings cannot be indented: string iscan_message = // Message of a Popup::Error for models which require - // the third-party Image Scan (IScan) driver software from Epson/Avasys. + // the third-party Image Scan (IScan) driver software from Epson + // (formerly Avasys, see https://bugzilla.novell.com/show_bug.cgi?id=746038). // Do not change or translate "Image Scan", it is a driver software name. - // Do not change or translate "Avasys, it is a manufacturer name. -_("The third-party Image Scan driver software from Avasys is required. -The Image Scan driver software is made and provided by Avasys -http://avasys.jp/eng/linux_driver/ + // Do not change or translate "Avasys", it is a manufacturer name. + // Do not change or translate "Epson", it is a manufacturer name. +_("The third-party Image Scan driver software from Epson/Avasys is required. +The Image Scan driver software is made and provided by Epson (formerly Avasys) +http://download.ebz.epson.net/dsc/search/01/search/?OSC=LXEpson +(formerly Avasys http://avasys.jp/eng/linux_driver/) where RPM packages for 32-bit (i386) and 64-bit (x86_64) architecture -can be downloaded (if you accept the Avasys and Epson license agreements). +can be downloaded (if you accept the Epson/Avasys license agreements). The Image Scan driver contains proprietary binary-only software. For some models it is only available for 32-bit (i386) architecture which does not work when you have a 64-bit system installation. Some scanners are also supported by another (free-software) driver. When your scanner model requires a DFSG non-free (proprietary) module, -you have to download and install two packages from Avasys: +you have to download and install two packages from Epson/Avasys: The 'iscan' package for the base software and an additional model dependant 'iscan-plugin' package with the proprietary module. "); @@ -414,16 +417,16 @@ && Package::Installed( "iscan" ) ) { // Each scanner which is supported by iscan-free is also supported by iscan. - // 'iscan' is the package name of the primary RPM which is provided by Avasys - // (there are also additional iscan-plugin-<model-name> provided by Avasys). + // 'iscan' is the package name of the primary RPM which is provided by Epson/Avasys + // (there are also additional iscan-plugin-<model-name> provided by Epson/Avasys). // If iscan is already installed, there is no need to switch to iscan-free. // Because iscan contains proprietary software it is not provided by openSUSE. - // Therefore the user must have had downloaded it from Avasys + // Therefore the user must have had downloaded it from Epson/Avasys // and then installed intentionally and manually. return true; } if( "iscan" == package_name ) - { y2milestone( "Third-party Image Scan driver software from Avasys required." ); + { y2milestone( "Third-party Image Scan driver software from Epson/Avasys required." ); Popup::Error( iscan_message ); return false; } @@ -793,10 +796,10 @@ `ReplacePoint( `id(`create_database_progress_replace_point), `DownloadProgress( feedback_message, database_filename, - // On my openSUSE 11.4 the size is about 891000 bytes. - // The number 921600 results exactly "900.0 KB" in the + // On my openSUSE 11.4 the size is about 930000 bytes. + // The number 1024000 results exactly "1000.0 KB" in the // YaST Gtk user inteface for a DownloadProgress: - 921600 + 1024000 ) ) ) @@ -1360,8 +1363,9 @@ // Scanner model list entry for models which require // the third-party Image Scan (IScan) driver software from Epson/Avasys. // Do not change or translate "Image Scan", it is a driver software name. - // Do not change or translate "Avasys, it is a manufacturer name. - string iscan_string = _("Third-party Image Scan driver software from Avasys required."); + // Do not change or translate "Avasys", it is a manufacturer name. + // Do not change or translate "Epson", it is a manufacturer name. + string iscan_string = _("Third-party Image Scan driver software from Epson/Avasys required."); list< term > model_items = []; foreach( map< string, string > database_entry, database, @@ -1890,7 +1894,7 @@ ) { if( ! TestAndInstallPackage( package_name ) ) { // There is already sufficient user information regarding - // the third-party Image Scan driver software from Avasys: + // the third-party Image Scan driver software from Epson/Avasys: if( package_name != "iscan" ) { Popup::AnyMessage( // Header of a Popup::AnyMessage: _("Required Package Not Installed"), @@ -2246,9 +2250,9 @@ _("&Scanner to Test"), scanners_to_be_tested ), - `HBox( `PushButton( `id(`cancel_button), Label::CancelButton() ), - `PushButton( `id(`ok_button), `opt(`default), Label::OKButton() ) - ) + `ButtonBox( `PushButton( `id(`cancel_button), Label::CancelButton() ), + `PushButton( `id(`ok_button), `opt(`default), Label::OKButton() ) + ) ) ); if( UI::UserInput() != `ok_button ) Modified: trunk/scanner/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/dialogs.ycp?rev=6809… ============================================================================== --- trunk/scanner/src/dialogs.ycp (original) +++ trunk/scanner/src/dialogs.ycp Tue May 8 15:25:22 2012 @@ -83,7 +83,7 @@ // Otherwise the user is asked for confirmation whether he want's to continue // despite the fact that the module might not work correctly if( ! Confirm::MustBeRoot() ) return `abort; - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the "abort" button in a single configuration dialog must now be named "cancel": Wizard::SetAbortButton( `abort, Label::CancelButton() ); // No "back" or "next" button at all makes any sense here @@ -154,12 +154,11 @@ ); WizardHW::SetContents( Scanner::OverviewContents() ); // In the Overview dialog the "next" button is used to finish the whole module. - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to YaST Style Guide (dated Tue, 04 Nov 2008) // the "finish" button in an Overview dialog must now be named "OK": Wizard::SetNextButton( `next, Label::OKButton() ); // In the Overview dialog it does not make sense to have a button with "back" functionality - // which is named "Cancel" according to the new YaST style guide at - // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // which is named "Cancel" according to the YaST Style Guide (dated Tue, 04 Nov 2008) // because there is nothing to "cancel" in the Overview dialog because it // only shows information about the current state of the configuration // but the Overview dialog itself does not do any change of the configuration. @@ -170,13 +169,13 @@ // If the user accepted in such a configuration sub-dialog what he changed // via the "OK" button there, the change is applied and the Overview dialog // shows the new current state of the configuration, see - // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implement…: + // http://en.opensuse.org/Archive:YaST_Printer_redesign#Basic_Implementation_P…: // so that it is not possible to "cancel" the change in the Overview dialog. // Any change of the configuration is done in sub-dialogs which are called // from the Overview dialog (even the "Confirm Deletion" popup is such a sub-dialog) // and in all those sub-dialogs there is a button with "cancel" functionality. Wizard::HideBackButton(); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -660,11 +659,11 @@ Label::BackButton(), Label::NextButton() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the button with the "back" functionality must be disabled // only when it is the first dialog of a wizard stlye dialog sequence. Wizard::HideBackButton(); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) @@ -736,12 +735,13 @@ continue; } // The epkowa backend in the package iscan-free is available for all architectures. - // In contrast the epkowa backend in the package iscan which is provided by Avasys + // In contrast the epkowa backend in the package iscan which is provided by Epson + // (formerly Avasys, see https://bugzilla.novell.com/show_bug.cgi?id=746038) // is only available for i386-compatible architectures: // True 32-bit i386 and also 64-bit x86_64. // For some models it might be only available for 32-bit i386 architecture. - // Some scanners require additionally proprietary libraries which are - // provided by Avasys as additional model dependant iscan-plugin-<model-name> RPMs. + // Some scanners require additionally proprietary libraries which are provided by + // Epson (formerly Avasys) as additional model dependant iscan-plugin-<model-name> RPMs. // For those scanners there is in the database "backend"="epkowa" and "package"="iscan". // The scanners which work with iscan-free have "backend"="epkowa" and "package"="iscan-free". // It would be possible to test for non-i386-compatible architecture in the ModelItems function @@ -818,10 +818,10 @@ // The content here is only a dummy. // The real content is what the "Progress:..." shows in ActivateBackend(). term contents = `Label( "" ); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the button with the "back" functionality is unchanged // when it is not the first dialog of a wizard stlye dialog sequence. - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the last "next" button of a wizard-style dialog sequence must be named "finish": Wizard::SetContentsButtons( caption, contents, @@ -829,7 +829,7 @@ Label::BackButton(), Label::FinishButton() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module // for a wizard stlye dialog sequence. // Instead within a wizard stlye dialog sequence the button with the @@ -955,14 +955,14 @@ ), `VStretch() ); - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // there is no longer a "abort" functionality which exits the whole module. // Instead this button is now named "Cancel" and its functionality is // to go back to the Overview dialog (i.e. what the "back" button would do) // because it reads "Cancel - Closes the window and returns to the overview." // Therefore the button with the "abort" functionality is not shown at all // and the button with the "back" functionality is named "Cancel". - // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… + // According to the YaST Style Guide (dated Tue, 04 Nov 2008) // the "finish" button in a single (step) configuration dialog must now be named "OK". Wizard::SetContentsButtons( caption, contents, Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=68099&… ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Tue May 8 15:25:22 2012 @@ -73,7 +73,7 @@ _(" A normal USB scanner should be detected automatically. By default, only those USB scanners are shown -for which the UDB vendor and product IDs are known. +for which the USB vendor and product IDs are known. If a USB scanner is not shown or if there are unexpected results, try Other and Restart Detection. It might happen that particular USB devices which are not scanners -- 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] r68098 - in /branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src: Storage.cc Volume.h
by fehr＠svn2.opensuse.org 08 May '12

08 May '12

Author: fehr Date: Tue May 8 15:24:56 2012 New Revision: 68098 URL: http://svn.opensuse.org/viewcvs/yast?rev=68098&view=rev Log: addtional fix for bnc#755704 Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc Tue May 8 15:24:56 2012 @@ -2537,7 +2537,9 @@ if(haveBtrfs(co)) { string mp = vol->getMount(); + bool mounted = vol->isMounted(); bool mby_uuid = vol->getMountBy()==MOUNTBY_UUID; + y2mil( "mounted btrfs:" << mounted ); co->eraseVolume( &(*vol) ); if( findVolume( device, vol ) && vol->cType()!=BTRFSC ) { @@ -2545,10 +2547,15 @@ vol->clearUsedBy(); vol->changeMount( mp ); if( !mp.empty() ) + { vol->setMount(mp); + if( mounted ) + vol->setMounted(); + } if( mby_uuid ) vol->changeMountBy( vol->defaultMountBy() ); ret = vol->setFormat( format, fs ); + y2mil( "mounted plain:" << vol->isMounted() ); } else y2war( "base volume for " << device << " not found" ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h Tue May 8 15:24:56 2012 @@ -170,6 +170,7 @@ int resizeFs(); void fstabUpdateDone(); bool isMounted() const { return( is_mounted ); } + void setMounted( bool mtd=true ) { is_mounted=mtd; } virtual Text removeText(bool doing) const; virtual Text createText(bool doing) const; virtual Text resizeText(bool doing) const; -- 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] r68097 - in /trunk/registration: package/yast2-registration.changes src/clients/suse_register_auto.ycp
by jdsn＠svn2.opensuse.org 08 May '12

08 May '12

Author: jdsn Date: Tue May 8 14:24:35 2012 New Revision: 68097 URL: http://svn.opensuse.org/viewcvs/yast?rev=68097&view=rev Log: fix typo Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/suse_register_auto.ycp Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Tue May 8 14:24:35 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 8 12:22:16 UTC 2012 - jdsn(a)suse.de + +- fix typo in help text (bnc#759735) + +------------------------------------------------------------------- Thu Mar 29 15:50:13 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/registration/src/clients/suse_register_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/suse_re… ============================================================================== --- trunk/registration/src/clients/suse_register_auto.ycp (original) +++ trunk/registration/src/clients/suse_register_auto.ycp Tue May 8 14:24:35 2012 @@ -208,7 +208,7 @@ string help_text_caption = sformat("%1", caption); string help_text_para1 = _("Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select Run Product Registration. To simplify the procedure, include information from your system with Hardware Profile and Optional Information."); string help_text_para2 = _("Get more information about the registration process with <tt>suse_register -h</tt>."); - string help_text_para3 = _("Other information used for registration is shown in Registration\nData. To add a new key and value pair, press Add then enter the\nappropriate values. These parameters are can be passed with <tt>suse_register\n-a</tt>. Get more information with <tt>suse_register -p</tt>. Remove a\nkey-value pair with Delete or modify an existing pair with Edit."); + string help_text_para3 = _("Other information used for registration is shown in Registration\nData. To add a new key and value pair, press Add then enter the\nappropriate values. These parameters are the ones that can be passed with <tt>suse_register\n-a</tt>. Get more information with <tt>suse_register -p</tt>. Remove a\nkey-value pair with Delete or modify an existing pair with Edit."); string help_text_para4 = _("If your network deploys a custom SMT server, set the URL of the SMT Server\nand the location of the SMT certificate in SMT Server Settings. Refer\nto your SMT manual for further assistance."); -- 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] r68096 - in /branches/SuSE-Code-11-SP3-Branch/storage: libstorage/src/Storage.cc libstorage/src/Volume.cc package/yast2-storage.changes
by fehr＠svn2.opensuse.org 08 May '12

08 May '12

Author: fehr Date: Tue May 8 13:53:52 2012 New Revision: 68096 URL: http://svn.opensuse.org/viewcvs/yast?rev=68096&view=rev Log: fix bug formatting a mounted btrfs volume as non-btrfs (bnc#755704) Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc Tue May 8 13:53:52 2012 @@ -2537,12 +2537,17 @@ if(haveBtrfs(co)) { string mp = vol->getMount(); + bool mby_uuid = vol->getMountBy()==MOUNTBY_UUID; co->eraseVolume( &(*vol) ); if( findVolume( device, vol ) && vol->cType()!=BTRFSC ) { vol->updateFsData(); vol->clearUsedBy(); vol->changeMount( mp ); + if( !mp.empty() ) + vol->setMount(mp); + if( mby_uuid ) + vol->changeMountBy( vol->defaultMountBy() ); ret = vol->setFormat( format, fs ); } else Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc Tue May 8 13:53:52 2012 @@ -1970,6 +1970,13 @@ ((getStorage()->instsys()&&mp=="swap"&&mp==orig_mp) || fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by || encryption!=orig_encryption); + if( ret ) + { + y2mil( "opt:" << fstab_opt << " oopt:" << orig_fstab_opt << + " mby:" << mount_by << " omby:" << orig_mount_by << + " enc:" << encryption << " oenc:" << orig_encryption ); + y2mil( "dev:" << device() << " ret:" << ret ); + } return( ret ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Tue May 8 13:53:52 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 8 13:53:07 CEST 2012 - fehr(a)suse.de + +- fix bug formatting a mounted btrfs volume as non-btrfs (bnc#755704) + +------------------------------------------------------------------- Mon May 7 15:26:13 CEST 2012 - fehr(a)suse.de - fix bug during creation of MD devices over multipath devices via -- 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] r68095 - in /branches/SuSE-Code-11-SP3-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstStorage.ycp
by ug＠svn2.opensuse.org 08 May '12

08 May '12

Author: ug Date: Tue May 8 11:27:35 2012 New Revision: 68095 URL: http://svn.opensuse.org/viewcvs/yast?rev=68095&view=rev Log: setting disklabel to gpt did not work bnc#757324 Modified: branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Modified: branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes Tue May 8 11:27:35 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 8 11:27:22 CEST 2012 - ug(a)suse.de + +- setting disklabel to gpt did not work bnc#757324 + +------------------------------------------------------------------- Tue May 8 11:24:57 CEST 2012 - ug(a)suse.de - software raid on multipath fixed Modified: branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Tue May 8 11:27:35 2012 @@ -731,6 +731,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] r68094 - in /branches/SuSE-Code-11-SP3-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstStorage.ycp
by ug＠svn2.opensuse.org 08 May '12

08 May '12

Author: ug Date: Tue May 8 11:25:27 2012 New Revision: 68094 URL: http://svn.opensuse.org/viewcvs/yast?rev=68094&view=rev Log: software raid on multipath fixed Modified: branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Modified: branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/autoinstallation/package/autoyast2.changes Tue May 8 11:25:27 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 8 11:24:57 CEST 2012 - ug(a)suse.de + +- software raid on multipath fixed + +------------------------------------------------------------------- Wed Jan 4 17:36:34 CET 2012 - ug(a)suse.de - the device guessing code in autoyast can ignore configured Modified: branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Tue May 8 11:25:27 2012 @@ -230,7 +230,8 @@ global define list GetRaidDevices (string dev, map<string,map> tm) { list<map> ret = []; foreach( string k, map d, tm, ``{ - if( d["type"]:`CT_UNKNOWN == `CT_DISK ) { + if( d["type"]:`CT_UNKNOWN == `CT_DISK || + d["type"]:`CT_UNKNOWN == `CT_DMMULTIPATH ) { list tmp = filter( map p, d["partitions"]:[], ``( p["raid_name"]:"" == dev ) ); ret = (list<map>)union( ret, tmp ); @@ -244,7 +245,8 @@ global define void SearchRaids (map<string,map> tm) { //raid2device = $[]; foreach( string k, map d, tm, ``{ - if( d["type"]:`CT_UNKNOWN == `CT_DISK ) { + if( d["type"]:`CT_UNKNOWN == `CT_DISK || + d["type"]:`CT_UNKNOWN == `CT_DMMULTIPATH ) { list<map> tmp = filter( map p, d["partitions"]:[], ``( p["raid_name"]:"" != "" ) ); list<string> devMd = maplist( map p, tmp, ``{ return p["raid_name"]:""; } ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0