May 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38168 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc src/Selection.cc
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 12:55:20 2007 New Revision: 38168 URL: http://svn.opensuse.org/viewcvs/yast?rev=38168&view=rev Log: - updated GPG callbacks (#277117) - improved logging (found by build check) - 2.15.20 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Selection.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=38168&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue May 29 12:55:20 2007 @@ -1 +1 @@ -2.15.19 +2.15.20 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue May 29 12:55:20 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 11:20:43 CEST 2007 - lslezak(a)suse.cz + +- updated GPG callbacks (#277117) +- 2.15.20 + +------------------------------------------------------------------- Thu May 17 15:35:54 CEST 2007 - lslezak(a)suse.cz - Evaluate start/finish callbacks in Pkg::SourceRestore() and Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Tue May 29 12:55:20 2007 @@ -1590,7 +1590,7 @@ { KeyRingSignal ( RecipientCtl & construct_r ) : Recipient( construct_r ) {} - virtual void trustedKeyAdded( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyAdded( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyAdded) ); @@ -1602,7 +1602,7 @@ } } - virtual void trustedKeyRemoved( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyRemoved( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyRemoved) ); Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Tue May 29 12:55:20 2007 @@ -117,7 +117,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetSelections(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetSelections(%s, ...)", status.c_str()); break; } @@ -218,7 +218,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetPatterns(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetPatterns(%s, ...)", status.c_str()); break; } -- 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] r38167 - in /trunk/ncurses/src: NCDialog.cc pkg/NCPackageSelector.cc pkg/NCPkgPopupDeps.cc
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 12:14:34 2007 New Revision: 38167 URL: http://svn.opensuse.org/viewcvs/yast?rev=38167&view=rev Log: Place all popup dialogs in pkg manager to the centre of the screen and calculate their size relatively to the screen size (if applicable) (#275610) Modified: trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=3816… ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Tue May 29 12:14:34 2007 @@ -1195,7 +1195,7 @@ helpIntro = _( "Press F1 or ESC to close this dialog." ); } - helpPopup = new NCPopupInfo( wpos(1,1), + helpPopup = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/3 ), // headline of the text mode help _( "Text Mode Navigation" ), YCPString( helpIntro + @@ -1203,6 +1203,8 @@ helpText ), "" ); + helpPopup->setNiceSize( NCurses::cols()/3, NCurses::lines()/3 ); + } if ( helpPopup ) { Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue May 29 12:14:34 2007 @@ -228,10 +228,10 @@ searchPopup = new NCPkgPopupSearch( wpos( 1, 1 ), this ); // the dependency popup - depsPopup = new NCPkgPopupDeps( wpos( 1, 1 ), this ); + depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this ); // the disk space popup - diskspacePopup = new NCPkgPopupDiskspace( wpos( 1, 1 ), testMode ); + diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); } @@ -1551,10 +1551,10 @@ return false; } - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), YCPString( "" ), YCPString(_( "All package dependencies are OK." )), NCPkgNames::OKLabel() ); - info.setNiceSize( 30, 5 ); + info.setNiceSize( 35, 5 ); if ( event.selection->compare( NCPkgNames::ShowDeps() ) == YO_EQUAL ) { @@ -1955,7 +1955,7 @@ if ( success ) { - NCPopupInfo info( wpos( 1, 1 ), + NCPopupInfo info( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), YCPString( "" ), YCPString( _("Dependency resolver test case written to ") + " " + testCaseDir ) ); info.setNiceSize( 40, 8 ); @@ -2014,11 +2014,12 @@ (void) unlink( filename->asString()->value_cstr() ); //present error popup to the user - NCPopupInfo errorMsg ( wpos( 2, 2 ), + NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), YCPString( NCPkgNames::ErrorLabel()), YCPString( _("Error exporting list of packages and patterns to ") + filename->toString() ), NCPkgNames::OKLabel(), ""); + errorMsg.setNiceSize(40,5); NCursesEvent input = errorMsg.showInfoPopup(); } @@ -2096,11 +2097,12 @@ { NCWAR << "Error importing list of packages and patterns from" << filename->toString() << endl; - NCPopupInfo errorMsg ( wpos( 2, 2 ), + NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , YCPString( NCPkgNames::ErrorLabel()), YCPString( _("Error importing list of packages and patterns from ") + filename->toString() ), NCPkgNames::OKLabel(), ""); + errorMsg.setNiceSize(40,5); NCursesEvent input = errorMsg.showInfoPopup(); } @@ -2157,7 +2159,7 @@ } // open the popup with the help text - NCPopupInfo pkgHelp( wpos( 1, 1 ), headline, YCPString( text ) ); + NCPopupInfo pkgHelp( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), headline, YCPString( text ) ); pkgHelp.setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); pkgHelp.showInfoPopup( ); @@ -2185,7 +2187,8 @@ text += NCPkgNames::YouHelp3(); // open the popup with the help text - NCPopupInfo youHelp( wpos( 1, 1 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); + NCPopupInfo youHelp( wpos( NCurses::lines()/3, NCurses::cols()/6 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); + youHelp.setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); youHelp.showInfoPopup( ); if ( packageList ) @@ -2208,7 +2211,7 @@ if (changes) { // show a popup and ask the user - NCPopupInfo cancelMsg( wpos( 2, 2 ), + NCPopupInfo cancelMsg( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ), YCPString( NCPkgNames::NotifyLabel() ), YCPString( NCPkgNames::CancelText() ), NCPkgNames::YesLabel(), @@ -2259,7 +2262,7 @@ if ( !youMode ) // don't show automatic changes if YOU mode { // show the automatic changes list - NCPkgPopupTable autoChangePopup( wpos( 1, 1), this ); + NCPkgPopupTable autoChangePopup( wpos( 3, 8), this ); NCursesEvent input = autoChangePopup.showInfoPopup(); if ( input == NCursesEvent::cancel ) @@ -2276,7 +2279,7 @@ if ( message != "" ) { // open the popup e.g. with the text "/usr needs 50 MB more disk space" - NCPopupInfo spaceMsg( wpos( 2, 2 ), + NCPopupInfo spaceMsg( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), YCPString( NCPkgNames::ErrorLabel() ), YCPString( NCPkgNames::DiskSpaceError() + " " + message ), NCPkgNames::OKLabel(), @@ -2383,11 +2386,12 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo info( wpos( 1, 1), + NCPopupInfo info( wpos( NCurses::lines()/10, (NCurses::cols()/10), NCPkgNames::NotifyLabel(), YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), NCPkgNames::AcceptLabel(), NCPkgNames::CancelLabel() ); + info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; @@ -2527,7 +2531,7 @@ bool ok = false; bool cancel = false; - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), YCPString( "" ), YCPString(_( "System dependencies verify OK." )), NCPkgNames::OKLabel() ); info.setNiceSize( 30, 5 ); @@ -2540,7 +2544,7 @@ //call the solver (with S_Verify it displays no popup) cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); //display the popup with automatic changes - NCPkgPopupTable autoChangePopup( wpos( 1, 1), this ); + NCPkgPopupTable autoChangePopup( wpos( 3, 8 ), this ); NCursesEvent input = autoChangePopup.showInfoPopup(); if ( input == NCursesEvent::cancel ) Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Tue May 29 12:14:34 2007 @@ -230,7 +230,7 @@ NCDBG << "Solving..." << endl ; - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2), YCPString( "" ), YCPString(NCPkgNames::Solving()), NCPkgNames::OKLabel() ); info.setNiceSize( 18, 4 ); -- 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] r38166 - /tags/stable-2_15_4/http-server/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:10:06 2007 New Revision: 38166 URL: http://svn.opensuse.org/viewcvs/yast?rev=38166&view=rev Log: Created tag stable-2_15_4 for http-server Added: tags/stable-2_15_4/http-server/ - copied from r38165, trunk/http-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] r38165 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServerWidgets.ycp src/dialogs.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:08:50 2007 New Revision: 38165 URL: http://svn.opensuse.org/viewcvs/yast?rev=38165&view=rev Log: improved workflow dialogs (host/hosts) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/dialogs.ycp trunk/http-server/src/wizards.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=38165&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Tue May 29 09:08:50 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue May 29 09:08:50 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 09:08:05 CEST 2007 - mzugec(a)suse.cz + +- improved workflow dialogs (host/hosts) +- 2.15.4 + +------------------------------------------------------------------- Fri May 11 14:26:47 CEST 2007 - mzugec(a)suse.cz - validation for VhostID when create new virtual host (#245155) Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Tue May 29 09:08:50 2007 @@ -202,7 +202,6 @@ // skip ourself also when this is main server if (( host == hostid ) || (hostid == "main")) continue; if (host == "main") continue; -// list< map<string,any> > desc = YaST::HTTPDData::GetHost (host); // find out the server name string value = (string)get_host_value ( "ServerName", YaST::HTTPDData::GetHost (host), nil ); if (value == servername) @@ -214,7 +213,6 @@ break; } -// value = (string)get_host_value ("HostIP", desc, nil); map<string, any> vhost = YaST::HTTPDData::GetVhostType(host); if (! FileUtils::CheckAndCreatePath( documentroot )){ @@ -319,12 +317,6 @@ ]); return nil; } -//symbol showAccessLogPopup (any key, map event); -//symbol showErrorLogPopup (any key, map event); - -//list <string> host_ids = nil; - -//void OverviewInit (string widget) { } /** * Handle overview (listen) widget @@ -636,8 +628,6 @@ global void storeServiceStatus (string key, map event); global void initAdaptFirewall (string key); global void storeAdaptFirewall (string opt_id, map event); -//global void DirectoryOptionInit (any key, string id); -//global void DirectoryOptionStore (any key, string id); // wizard widget functions global void initOpenPort (string key); @@ -647,10 +637,9 @@ global boolean validateListenInterfaces(string key, map event); global void initFwOpen (string key); global void storeFwOpen (string opt_id, map event); -//void initExpertConf (string key); global symbol handleExpertConf (string key, map event); void initScriptModules(string key); -void initSummaryText(string key); +void initSummaryText(string key); global symbol handleBooting (string key, map event); global map getHostOptions(boolean is_main_server); boolean getServiceAutoStart(); @@ -677,8 +666,6 @@ // table cell description "label" : _("Server Name"), "widget" : `textentry, -// "validate_type" : `function, -// "validate_function" : validate_servername, ], ], "DocumentRoot" : $[ Modified: trunk/http-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/http-server/src/dialogs.ycp (original) +++ trunk/http-server/src/dialogs.ycp Tue May 29 09:08:50 2007 @@ -257,7 +257,7 @@ // translators: dialog caption, %1 is the host name string caption = sformat( _("SSL Configuration for '%1'"), // translators: human-readable "default host" - HttpServerWidgets::currenthost == "defaulthost" ? _("Default Host") + HttpServerWidgets::currenthost == "main" ? _("Default Host") : HttpServerWidgets::get_host_value ( "ServerName" , YaST::HTTPDData::GetHost(HttpServerWidgets::currenthost), HttpServerWidgets::currenthost ) ); Modified: trunk/http-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/http-server/src/wizards.ycp (original) +++ trunk/http-server/src/wizards.ycp Tue May 29 09:08:50 2007 @@ -20,45 +20,24 @@ include "http-server/dialogs.ycp"; include "http-server/wizard-dialog.ycp"; +define symbol MainSequence(); -/** - * Main workflow of the http-server configuration - * @return sequence result - */ -symbol MainSequence() { +symbol VirtualHostSequence(string action){ map aliases = $[ - "overview" : ``( OverviewDialog() ), "host" : ``( HostDialog() ), - "main-host" : ``( HostDialog() ), // different workflow "addhost" : ``( AddHost() ), "setvhost" : ``( SetVHostOptions() ), "ssl" : ``( SSLDialog () ), "dir" : ``( DirDialog () ), - "ssl-default" : ``( SSLDialog () ), ]; + string def = (action=="add")?"addhost":"host"; map sequence = $[ - "ws_start" : "overview", - "overview" : $[ - `abort : `abort, - `next : `next, - `default : "main-host", -// `hosts : "hosts", - `dir : "dir", - `ssl : "ssl-default", - `edit : "host", - `add : "addhost", - ], - "ssl-default" : $[ - `abort : `abort, - `next : "main-host", - `back : "main-host", - ], + "ws_start" : def, "host" : $[ `abort : `abort, - `next : "overview", -// `back : "hosts", + `next : `next, //"overview", `ssl : "ssl", `dir : "dir" ], @@ -66,11 +45,10 @@ "addhost": $[ `abort : `abort, `next : "setvhost", -// `back : "hosts", ], "setvhost": $[ `abort : `abort, - `next : "overview", + `next : `next, //"overview", `back : "addhost" ], "ssl": $[ @@ -85,6 +63,51 @@ ] ]; + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the http-server configuration + * @return sequence result + */ +symbol MainSequence() { + + map aliases = $[ + "overview" : ``( OverviewDialog() ), + "addhost" : ``( AddHost() ), + "setvhost" : ``( SetVHostOptions() ), + "dir" : ``( DirDialog () ), + "add-vh" : [ ``( VirtualHostSequence("add")), true ], + "edit-vh" : [ ``( VirtualHostSequence("edit")), true ] + ]; + + map sequence = $[ + "ws_start" : "overview", + "overview" : $[ + `abort : `abort, + `next : `next, + `dir : "dir", + `edit : "edit-vh", + `add : "add-vh", + ], + "add-vh" : $[ + `next : "overview" //`next + ], + "edit-vh" : $[ + `next : "overview" //`next + ], + "setvhost": $[ + `abort : `abort, + `next : "overview", + `back : "addhost" + ], + "dir": $[ + `abort : `abort, + `next : "overview", + `back : "overview" + ] + ]; + symbol ret = Sequencer::Run(aliases, sequence); return ret; -- 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] r38164 - /tags/stable-2_15_36/network/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:04:23 2007 New Revision: 38164 URL: http://svn.opensuse.org/viewcvs/yast?rev=38164&view=rev Log: Created tag stable-2_15_36 for network Added: tags/stable-2_15_36/network/ - copied from r38163, trunk/network/ -- 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] r38163 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/lan/complex.ycp src/lan/hardware.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:04:15 2007 New Revision: 38163 URL: http://svn.opensuse.org/viewcvs/yast?rev=38163&view=rev Log: improve add/edit device dialogs (device type) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38163&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 29 09:04:15 2007 @@ -1 +1 @@ -2.15.35 +2.15.36 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 29 09:04:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 09:03:20 CEST 2007 - mzugec(a)suse.cz + +- improve add/edit device dialogs (device type) +- 2.15.36 + +------------------------------------------------------------------- Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz - disable routing dialog when NetworkManager used (#178538) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue May 29 09:04:15 2007 @@ -135,14 +135,11 @@ break; case "none" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `none); break; - - } } symbol handleBootProto (string key, map event) { -// if (event["EventReason"]:"" == "ValueChanged"){ boolean none = false; boolean dynamic = false; boolean stat = false; @@ -157,8 +154,6 @@ UI::ChangeWidget(`dyn, `Enabled, dynamic); UI::ChangeWidget(`ipaddr, `Enabled, stat); UI::ChangeWidget(`netmask, `Enabled, stat); - -// } return nil; } @@ -196,22 +191,13 @@ void initIfcfg (string key) { UI::ChangeWidget(`id(key), `Value, Lan::type); + UI::ChangeWidget(`id(key), `Enabled, false); } void initIfcfgId (string key) { UI::ChangeWidget(`id(key), `Value, Lan::device); } -/** - * Event handler for ifcfg name - * enable or disable depending on whether we are adding a new interface - * @param key the widget receiving the event - * @param event the event being handled - * @return nil so that the dialog loops on - */ -symbol HandleIfcfg (string key, map event) { - UI::ChangeWidget (`id (key), `Enabled, Lan::operation == `add); - return nil; -} + /** * Remap the buttons to their Wizard Sequencer values @@ -300,18 +286,6 @@ } /** - * Initialize the dialog as a whole - * Sets default focus - * @param key id of the widget - */ - -/* -void InitDialog (string key) { - UI::SetFocus (`id ("IPADDR")); -} -*/ - -/** * If the traffic would be blocked, ask the user * if he wants to change it * @param event the event being handled @@ -381,19 +355,6 @@ } /** - * Store values computed from the whole dialog - * @param key the widget being validated - * @param event the event being handled - */ - -/* -void StoreDialog (string key, map event) { - return; -} -*/ - - -/** * Initialize value of firewall zone widget * (disables it when SuSEFirewall is not installed) * @param key id of the widget @@ -410,7 +371,7 @@ "widget" : `custom, "custom_widget" : /* Frame label */ - `Frame(`id(`f_additional), _("Additional Addresses"), `HBox(`HSpacing(3), `VBox( + `Frame(`id(`f_additional), _("Additional Addresses"), `HBox(`HSpacing(3), `VBox( `VSpacing(1), `Table(`id(`table), `opt(`notify), `header( /* Table header label */ @@ -498,7 +459,7 @@ "help": "", // "items" will be filled in the dialog itself "init" : initIfcfg, - "handle": HandleIfcfg, +// "handle": HandleIfcfg, "validate_type": `function, "validate_function": ValidateIfcfgType, ], @@ -511,7 +472,7 @@ "help": "", "init" : initIfcfgId, "valid_chars": NetworkDevices::ValidCharsIfcfg (), - "handle": HandleIfcfg, +// "handle": HandleIfcfg, ], "BONDSLAVE": $[ @@ -883,21 +844,16 @@ "tab_help" : "", "fallback_functions" : functions, ]; - -// if (Lan::operation == `add) wd_content["initial_tab"] = "hardware"; - + hw_standalone=false; wd = (map<string, map<string,any> >) union (wd, $[ "tab" : CWMTab::CreateWidget (wd_content) ]); - term contents2 = `HBox ("tab"); - - any ret = CWM::ShowAndRun ( $[ "widget_names": ["tab"], "widget_descr": wd, - "contents": contents2, + "contents": `HBox ("tab"), /* Address dialog caption */ "caption": _("Network Card Setup"), "back_button" : Label::BackButton (), @@ -905,7 +861,7 @@ "fallback_functions" : functions, ]); y2milestone ("ShowAndRun: %1", ret); - + if (ret != `back && ret != `abort) { string ifcfgname = NetworkDevices::device_name ( Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Tue May 29 09:04:15 2007 @@ -216,10 +216,8 @@ list<map<string,any> > o_items = nil; void initOverview (string key) ``{ -// if (o_items == nil){ o_items = (list<map<string,any> >)Lan::Overview(); o_items = o_items + Lan::Unconfigured (); -// } list<term> term_items = maplist (map<string,any> i, o_items, { term t = `item (`id (i["id"]:"")); Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue May 29 09:04:15 2007 @@ -61,11 +61,13 @@ _("Options for the module should be written in the format specified in the IBM Device Drivers and Installation Commands manual."); } + map<string, any> hardware = nil; +boolean hw_standalone=false; + void initHwDialog(string text) { hardware = $[]; -// ScreenName("lan-hardware"); /* Manual dialog caption */ string caption = _("Manual Network Card Configuration"); @@ -88,7 +90,7 @@ // #38213, remember device id when we switch back from pcmcia/usb hardware["non_hotplug_device_id"] = hardware["device"]:""; hardware["hwcfg"] = Lan::nm_name; -if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; + if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; // FIXME duplicated in address.ycp hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; @@ -99,10 +101,9 @@ if(Arch::ia64 ()) hardware["device_types"] = add(hardware["device_types"]:[], "xp"); - if(issubstring(hardware["device"]:"", "bus-pcmcia")) - hardware["hotplug"] = "pcmcia"; - else if(issubstring(hardware["device"]:"", "bus-usb")) - hardware["hotplug"] = "usb"; + if(issubstring(hardware["device"]:"", "bus-pcmcia")) hardware["hotplug"] = "pcmcia"; + else if(issubstring(hardware["device"]:"", "bus-usb")) hardware["hotplug"] = "usb"; + y2milestone("hotplug=%1", Lan::hotplug); term CheckBoxes = `HBox( @@ -124,9 +125,6 @@ `HSpacing(1.5) ); - /* Pushbutton label */ - term ListButton = `PushButton(`id(`list), _("Select from &List")); - /* Disable PCMCIA and USB checkboxex on Edit and s390 */ if(Lan::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true) CheckBoxes = `VSpacing(0); @@ -147,6 +145,7 @@ CheckBoxes, `VSpacing(0.4) ),`HSpacing(0.5))); + hardware["devices"] = Lan::FreeDevices(hardware["realtype"]:""); // TODO: id-, bus-, ... here if(!contains(hardware["devices"]:[], hardware["device"]:"")) hardware["devices"] = prepend(hardware["devices"]:[], hardware["device"]:""); @@ -156,7 +155,6 @@ /* Manual dialog contents */ term TypeNameWidgets = -// `Frame(_("Network &Configuration"), `VBox( `VSpacing(0.2), `HBox( @@ -168,8 +166,6 @@ DeviceNumberBox, `HSpacing(0.5) ) -// `VSpacing(0.2) -// ) ); /* Add hardware -> don't allow some changes (card type) */ @@ -201,7 +197,8 @@ term ButtonBox = `HBox( `HStretch(), `HSpacing(0.5), - ListButton, + /* Pushbutton label */ + `PushButton(`id(`list), _("Select from &List")), `HSpacing(0.5), `HStretch() ); @@ -223,6 +220,7 @@ )); UI::ReplaceWidget(`hw_content, contents); + if (Lan::nm_name=="" && Lan::nm_name_old!=nil) UI::ChangeWidget(`enable_hwconfig, `Value, false); hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; @@ -232,7 +230,7 @@ ChangeWidgetIfExists(`id(`hwcfg), `Enabled, hardware["no_hotplug"]:false); ChangeWidgetIfExists(`id(`usb), `Enabled, (hardware["hotplug"]:"" == "usb" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); ChangeWidgetIfExists(`id(`pcmcia), `Enabled, (hardware["hotplug"]:"" == "pcmcia" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); - + if (!hw_standalone) ChangeWidgetIfExists(`id(`dev), `Enabled,false); ChangeWidgetIfExists(`id(`num), `ValidChars, NetworkDevices::ValidCharsIfcfg ()); ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); } @@ -723,6 +721,7 @@ any HardwareDialog (){ string caption = _("Hardware Dialog"); + hw_standalone = true; list<map <string, any> > w = CWM::CreateWidgets (["HWDIALOG"], (map <string, map <string, any> >) widget_descr_hardware); term contents = `VBox( -- 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] r38162 - /tags/stable-2_15_35/network/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 17:09:24 2007 New Revision: 38162 URL: http://svn.opensuse.org/viewcvs/yast?rev=38162&view=rev Log: Created tag stable-2_15_35 for network Added: tags/stable-2_15_35/network/ - copied from r38161, trunk/network/ -- 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] r38161 - in /trunk/network: VERSION package/yast2-network.changes src/services/routing.ycp
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 17:09:18 2007 New Revision: 38161 URL: http://svn.opensuse.org/viewcvs/yast?rev=38161&view=rev Log: disable routing dialog when NetworkManager used (#178538) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/routing.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38161&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 17:09:18 2007 @@ -1 +1 @@ -2.15.34 +2.15.35 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 17:09:18 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz + +- disable routing dialog when NetworkManager used (#178538) +- 2.15.35 + +------------------------------------------------------------------- Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz - installation network changes: Modified: trunk/network/src/services/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp… ============================================================================== --- trunk/network/src/services/routing.ycp (original) +++ trunk/network/src/services/routing.ycp Mon May 28 17:09:18 2007 @@ -22,6 +22,7 @@ import "Lan"; import "CWM"; import "CWMTab"; +import "NetworkService"; include "network/lan/help.ycp"; include "network/routines.ycp"; @@ -58,7 +59,7 @@ )); if(entry[4]:"" != "") - UI::ChangeWidget(`id(`device), `Value, entry[4]:""); + UI::ChangeWidget(`id(`device), `Value, entry[4]:""); UI::ChangeWidget(`id(`destination), `ValidChars, IP::ValidChars + "default" + "/-"); UI::ChangeWidget(`id(`gateway), `ValidChars, IP::ValidChars + "-"); UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars + "-"); @@ -165,6 +166,15 @@ UI::ChangeWidget(`id(`add), `Enabled, false); UI::SetFocus(`id(`gw)); + // #178538 - disable routing dialog when NetworkManager is used + boolean enabled = !(boolean)NetworkService::IsManaged(); + + UI::ChangeWidget(`id(`gw), `Enabled, enabled); + UI::ChangeWidget(`id(`table), `Enabled, enabled); + UI::ChangeWidget(`id(`forward), `Enabled, enabled); + UI::ChangeWidget(`id(`add), `Enabled, enabled); + UI::ChangeWidget(`id(`expert), `Enabled, enabled); + // fixed bug #73739 - if dhcp is used, dont set default gw statically // if (Lan::bootproto == "dhcp")UI::ChangeWidget(`id(`gw),`Enabled, false); } -- 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] r38160 - in /trunk/installation: control/control.SLD.xml control/control.SLES.xml control/examples/custom.xml control/tests/test.xml package/yast2-installation.changes
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 16:03:18 2007 New Revision: 38160 URL: http://svn.opensuse.org/viewcvs/yast?rev=38160&view=rev Log: removed netsetup item from control files Modified: trunk/installation/control/control.SLD.xml trunk/installation/control/control.SLES.xml trunk/installation/control/examples/custom.xml trunk/installation/control/tests/test.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLD.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD… ============================================================================== --- trunk/installation/control/control.SLD.xml (original) +++ trunk/installation/control/control.SLD.xml Mon May 28 16:03:18 2007 @@ -538,10 +538,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -629,12 +625,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -787,10 +777,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Mon May 28 16:03:18 2007 @@ -661,10 +661,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -752,12 +748,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -915,10 +905,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/examples/custom.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/cu… ============================================================================== --- trunk/installation/control/examples/custom.xml (original) +++ trunk/installation/control/examples/custom.xml Mon May 28 16:03:18 2007 @@ -378,19 +378,10 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>rpmcopy</name> </module> <module> <label>Network</label> - <name>netsetup</name> - <arguments>false,false,`dn</arguments> - </module> - <module> - <label>Network</label> <name>proposal</name> <arguments>true,true,`net</arguments> </module> @@ -435,10 +426,6 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>netprobe</name> </module> <module> @@ -561,10 +548,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/tests/test.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/tests/test.… ============================================================================== --- trunk/installation/control/tests/test.xml (original) +++ trunk/installation/control/tests/test.xml Mon May 28 16:03:18 2007 @@ -316,9 +316,6 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - </module> - <module> <name>rpmcopy</name> </module> <module> @@ -368,10 +365,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -497,9 +490,6 @@ <mode>autoinstallation</mode> <modules config:type="list"> <module> - <name>netsetup</name> - </module> - <module> <name>netprobe</name> </module> <module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 28 16:03:18 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 16:02:38 CEST 2007 - mzugec(a)suse.cz + +- removed netsetup item from control files + +------------------------------------------------------------------- Mon May 28 13:33:08 CEST 2007 - mzugec(a)suse.cz - removed inst_netsetup item from control files -- 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] r38159 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 16:01:34 2007 New Revision: 38159 URL: http://svn.opensuse.org/viewcvs/yast?rev=38159&view=rev Log: - reinitialize the package manager before creating another image Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon May 28 16:01:34 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 15:59:55 CEST 2007 - lslezak(a)suse.cz + +- reinitialize the package manager before creating another image + +------------------------------------------------------------------- Mon May 28 09:01:06 CEST 2007 - lslezak(a)suse.cz - install "yast2-instserver" package (.content_file agent) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 16:01:34 2007 @@ -93,6 +93,9 @@ // What we want to create with kiwi global string kiwi_task = "iso"; +// original source configuration, needed to reset the package manager +list<map<string,any> > original_config = nil; + /** * Data was modified? * @return true if modified @@ -287,6 +290,11 @@ } }); + if (id == -1) + { + y2error("Source %1 not found!", url); + } + return id; }); @@ -1815,6 +1823,19 @@ global define void enableSources()``{ + // TODO FIXME: use better way to reset the source config in the package manager + if (original_config != nil) + { + y2milestone("Restoring original config: %1", original_config); + Pkg::SourceEditSet(original_config); + Pkg::SourceFinishAll(); + } + else + { + original_config = Pkg::SourceEditGet(); + y2milestone("Current source configuration: %1", original_config); + } + Pkg::SourceStartManager(false); y2milestone("sources: %1", ProductCreator::Config["sources"]:[]); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0