September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40837 - in /trunk/squid: VERSION config/ package/yast2-squid.changes
by dfiser＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: dfiser Date: Mon Sep 10 16:25:26 2007 New Revision: 40837 URL: http://svn.opensuse.org/viewcvs/yast?rev=40837&view=rev Log: v2.15.4 Modified: trunk/squid/VERSION trunk/squid/config/ (props changed) trunk/squid/package/yast2-squid.changes Modified: trunk/squid/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/VERSION?rev=40837&r1=40836… ============================================================================== --- trunk/squid/VERSION (original) +++ trunk/squid/VERSION Mon Sep 10 16:25:26 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.change… ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Mon Sep 10 16:25:26 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 10 16:17:06 CEST 2007 - dfiser(a)suse.cz + +- Added possibility to open configured ports in firewall. +- Changed alignment and position of some widgets. +- v2.15.4 + +------------------------------------------------------------------- Tue Sep 4 15:37:38 CEST 2007 - dfiser(a)suse.cz - Added .rnc schema file (bug #304267). -- 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] r40836 - in /trunk/squid: ./ config/ config/SuSEfirewall2/ src/
by dfiser＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: dfiser Date: Mon Sep 10 16:14:41 2007 New Revision: 40836 URL: http://svn.opensuse.org/viewcvs/yast?rev=40836&view=rev Log: Now it's possible to open configured ports in firewall. It requires to add new sysconfig file /etc/sysconfig/SuSEfirewall2/services/squid to system. squid.desktop and squid.rnc files moved into config directory. Added: trunk/squid/config/ trunk/squid/config/Makefile.am trunk/squid/config/SuSEfirewall2/ trunk/squid/config/SuSEfirewall2/squid trunk/squid/config/squid.desktop - copied unchanged from r40822, trunk/squid/src/squid.desktop trunk/squid/config/squid.rnc - copied unchanged from r40822, trunk/squid/src/squid.rnc Removed: trunk/squid/src/squid.desktop trunk/squid/src/squid.rnc Modified: trunk/squid/src/Makefile.am trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/yast2-squid.spec.in Added: trunk/squid/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/config/Makefile.am?rev=408… ============================================================================== --- trunk/squid/config/Makefile.am (added) +++ trunk/squid/config/Makefile.am Mon Sep 10 16:14:41 2007 @@ -0,0 +1,14 @@ +# Makefile.am for squid/src + +rncdir = $(schemadir)/autoyast/rnc +pkgdatadir = /etc/sysconfig/SuSEfirewall2.d/services + +desktop_DATA = \ + squid.desktop + +rnc_DATA = squid.rnc + +pkgdata_DATA = SuSEfirewall2/squid + +EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(pkgdata_DATA) + Added: trunk/squid/config/SuSEfirewall2/squid URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/config/SuSEfirewall2/squid… ============================================================================== --- trunk/squid/config/SuSEfirewall2/squid (added) +++ trunk/squid/config/SuSEfirewall2/squid Mon Sep 10 16:14:41 2007 @@ -0,0 +1,7 @@ +## Name: Squid Service +## Description: Opens ports for Squid +TCP="" +UDP="" +RPC="" +IP="" +BROADCAST="" Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40836&… ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Mon Sep 10 16:14:41 2007 @@ -1,7 +1,6 @@ # Makefile.am for squid/src yncludedir = @yncludedir@/squid -rncdir = $(schemadir)/autoyast/rnc client_DATA = \ squid.ycp \ @@ -19,21 +18,16 @@ helper_functions.ycp \ handlers.ycp -desktop_DATA = \ - squid.desktop - module_DATA = \ Squid.ycp \ SquidACL.ycp \ SquidErrorMessages.ycp -rnc_DATA = squid.rnc - # create a symlink for local build, #145327 squid: ln -sf . $@ ycpchook = squid -EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA) +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40836&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Mon Sep 10 16:14:41 2007 @@ -42,12 +42,27 @@ import "Service"; import "Summary"; import "FileUtils"; +import "SuSEFirewall"; /** * Defines path used in SCR::Read/Write functions */ path squid_path = .etc.squid; +/** + * Defines location of sysconfig file + */ +string sysconfig_file = "/etc/sysconfig/SuSEfirewall2.d/services/squid"; + +/** + * Defines name of service which is used by firewall when it's openning ports. + */ +string firewall_service_name = "service:squid"; +global string GetFirewallServiceName() +{ + return firewall_service_name; +} + /** * Data was modified? @@ -703,6 +718,20 @@ /**** REFRESH PATTERN END ****/ /**** HTTP PORT *****/ +/** + * Returns only list of configured ports (no hosts and so on) + */ +global list<string> GetHttpPortsOnly() +{ + list<string> ret = []; + foreach (map<string, any> value, http_ports, + { + if (size(value["port"]:"") > 0) + ret = add(ret, value["port"]:""); + }); + return ret; +} + global list <map<string, any> > GetHttpPorts() { return http_ports; @@ -998,9 +1027,6 @@ if (!readRestSetting()) ok = false; Progress::NextStage(); - if (!readServiceStatus()) ok = false; - Progress::NextStage(); - return ok; } @@ -1013,25 +1039,44 @@ Progress::New(_("Initializing squid Configuration"), " ", - 6, + 7, [_("Read HTTP Ports from config file."), _("Read Refresh Patterns from config file."), _("Read ACL Groups from config file."), _("Read Access Control table from config file."), _("Read the rest settings."), - _("Read service status.")], + _("Read service status."), + _("Read firewall settings.")], [_("Reading HTTP Ports ..."), _("Reading Refresh Patterns ..."), _("Reading ACL Groups ..."), _("Reading Access Control table ..."), _("Reading the rest settings ..."), - _("Reading service status ...")], + _("Reading service status ..."), + _("Reading firewall settings ...")], ""); if(Abort()) return false; Progress::NextStage(); - ok = readAllSettings(); + if (!readAllSettings()){ + ok = false; + Report::Error(_("Cannot read configuration file.")); + } + + if (!readServiceStatus()){ + ok = false; + Report::Error(_("Cannot read service status.")); + } + Progress::NextStage(); + + Progress::set(false); + if (!SuSEFirewall::Read()){ + ok = false; + Report::Error(_("Cannot read firewall settings.")); + } + Progress::set(true); + Progress::NextStage(); y2milestone("================ Setting ======================"); y2debug("Squid::Read - http_ports: %1",http_ports); @@ -1042,9 +1087,6 @@ y2debug("Squid::Read - enabled: %1", service_enabled_on_startup); y2milestone("================ Setting END =================="); - /* Error message */ - if(!ok) Report::Error(_("Cannot read configuration file.")); - return ok; } /******************** READ END ******************/ @@ -1199,11 +1241,26 @@ y2milestone("Squid::writeAllSettings started"); - if (!writeHttpPorts()) ok = false; - if (!writeACLs()) ok = false; - if (!writeHttpAccesses()) ok = false; - if (!writeRefreshPatterns()) ok = false; - if (!writeRestSetting()) ok = false; + if (!writeHttpPorts()){ + y2error("Squid::writeAllSettings - writeHttpPorts failed"); + ok = false; + } + if (!writeACLs()){ + y2error("Squid::writeAllSettings - writeACLs failed"); + ok = false; + } + if (!writeHttpAccesses()){ + y2error("Squid::writeAllSettings - writeHttpAccesses failed"); + ok = false; + } + if (!writeRefreshPatterns()){ + y2error("Squid::writeAllSettings - writeRefreshPatterns failed"); + ok = false; + } + if (!writeRestSetting()){ + y2error("Squid::writeAllSettings - writeRestSetting failed"); + ok = false; + } if (ok){ if (!SCR::Write(squid_path, nil)){ @@ -1217,6 +1274,51 @@ return ok; } +boolean writeFirewallSettings() +{ + boolean ok = true; + + if (!GetModified()){ + y2debug("Squid::writeFirewallSettings - no setting to write, because nothing's changed"); + return ok; + } + + if (!SCR::RegisterAgent (.firewall_service_definition, `ag_ini(`SysConfigFile(sysconfig_file)))){ + ok = false; + y2error("Unable to register sysconfig agent for %1", sysconfig_file); + } + if (!SCR::Write(.firewall_service_definition.TCP, mergestring(GetHttpPortsOnly(), " ")) || + !SCR::Write(.firewall_service_definition, nil)){ + ok = false; + y2error("Unable to write settings into sysconfig file %1", sysconfig_file); + } + if (!SCR::UnregisterAgent (.firewall_service_definition)){ + ok = false; + y2error("Unable to unregister sysconfig agent for %1", sysconfig_file); + } + // write /etc/sysconfig/SuSEFirewall2.d/services/squid file: + /* + string service_squid_file = + "## Name: Squid Service\n" + + "## Description: Opens ports for Squid\n" + + "TCP=\"" + mergestring(GetHttpPortsOnly(), " ") +"\"\n"; + if (!SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/squid", service_squid_file)){ + y2error("Squid::writeFirewallSettings - failed to write into /etc/sysconfig/SuSEfirewall2.d/services/squid file."); + ok = false; + } + */ + + // write firewall settings + SuSEFirewall::SetModified(); + Progress::set(false); + if (!SuSEFirewall::Write()){ + y2error("Squid::writeFirewallSettings - SuSEFirewall::Write failed"); + ok = false; + } + Progress::set(true); + + return ok; +} /** * Returns true if Squid service is running. @@ -1291,16 +1393,20 @@ // We do not set help text here, because it was set outside Progress::New(_("Saving Squid Configuration"), " ", - 2, + 3, [ /* Progress stage 1/2 */ _("Write the settings"), + /* Progress stage 1/2 */ + _("Write firewall settings"), /* Progress stage 2/2 */ _("Start Service") ], [ /* Progress step 1/2 */ _("Writing the settings..."), + /* Progress step 1/2 */ + _("Writing firewall settings..."), /* Progress step 2/2 */ _("Starting Service..."), /* Progress finished */ @@ -1318,6 +1424,13 @@ ok = false; } + //firewall + if (!writeFirewallSettings()){ + Report::Error(_("Cannot write firewall settings.")); + ok = false; + } + Progress::NextStage(); + //enabling / disabling service if (service_enabled_on_startup == true) EnableService(); if (service_enabled_on_startup == false) DisableService(); Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40836&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Mon Sep 10 16:14:41 2007 @@ -35,6 +35,7 @@ import "Confirm"; import "DialogTree"; import "CWMServiceStart"; +import "CWMFirewallInterfaces"; import "PackageSystem"; import "Squid"; import "Mode"; @@ -121,6 +122,12 @@ _("Save Settings and Restart Squid Now") ) ]), + "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget($[ + "services" : [Squid::GetFirewallServiceName], + "display_details" : true, + "open_firewall_checkbox" : _("Open Ports in Firewall") + ]), + "http_ports_table" : $[ "widget" : `custom, @@ -193,13 +200,15 @@ map<string, map<string, any> > screens = $[ "s1" : $[ - "widget_names" : ["auto_start", "start_stop"], + "widget_names" : ["auto_start", "start_stop", "firewall"], "contents" : `HBox( `HSpacing(3), `Top(`VBox( "auto_start", `VSpacing(), - (Mode::normal() ? "start_stop" : `Empty()) + (Mode::normal() ? "start_stop" : `Empty()), + `VSpacing(), + `Frame(_("Firewall Settings"), "firewall") )), `HSpacing(3) ), Modified: trunk/squid/yast2-squid.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=40… ============================================================================== --- trunk/squid/yast2-squid.spec.in (original) +++ trunk/squid/yast2-squid.spec.in Mon Sep 10 16:14:41 2007 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -Requires: yast2 +Requires: yast2 filesystem BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildArchitectures: noarch @@ -22,6 +22,7 @@ %files %defattr(-,root,root) %dir @yncludedir@/squid +%config /etc/sysconfig/SuSEfirewall2.d/services/squid @yncludedir@/squid/* @clientdir@/squid.ycp @clientdir@/squid_*.ycp -- 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] r40835 - in /trunk/live-installer: VERSION package/yast2-live-installer.changes
by jsrain＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jsrain Date: Mon Sep 10 13:48:04 2007 New Revision: 40835 URL: http://svn.opensuse.org/viewcvs/yast?rev=40835&view=rev Log: bump Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=40835… ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Mon Sep 10 13:48:04 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Mon Sep 10 13:48:04 2007 @@ -3,6 +3,7 @@ - remove the yast2-live-installer package after live installation (#307687) +- 2.15.8 ------------------------------------------------------------------- Wed Aug 22 17:06:42 CEST 2007 - jsrain(a)suse.cz -- 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] r40834 - /tags/stable-2_15_8/live-installer/
by jsrain＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jsrain Date: Mon Sep 10 13:45:40 2007 New Revision: 40834 URL: http://svn.opensuse.org/viewcvs/yast?rev=40834&view=rev Log: Created tag stable-2_15_8 for live-installer Added: tags/stable-2_15_8/live-installer/ - copied from r40833, trunk/live-installer/ -- 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] r40833 - /trunk/live-installer/src/inst_live_cleanup.ycp
by jsrain＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jsrain Date: Mon Sep 10 13:45:25 2007 New Revision: 40833 URL: http://svn.opensuse.org/viewcvs/yast?rev=40833&view=rev Log: added appropriate comment Modified: trunk/live-installer/src/inst_live_cleanup.ycp Modified: trunk/live-installer/src/inst_live_cleanup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_cle… ============================================================================== --- trunk/live-installer/src/inst_live_cleanup.ycp (original) +++ trunk/live-installer/src/inst_live_cleanup.ycp Mon Sep 10 13:45:25 2007 @@ -13,6 +13,7 @@ if(GetInstArgs::going_back()) return `auto; +// calling RPM is faster than initializing whole update stack y2milestone ("Removing yast2-live-installer package"); map out = (map)SCR::Execute (.target.bash_output, "/bin/rpm -e yast2-live-installer"); -- 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] r40832 - in /trunk/live-installer: package/yast2-live-installer.changes src/control/live-install.xml src/inst_live_cleanup.ycp
by jsrain＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jsrain Date: Mon Sep 10 13:30:40 2007 New Revision: 40832 URL: http://svn.opensuse.org/viewcvs/yast?rev=40832&view=rev Log: remove the yast2-live-installer package after live installation (#307687) Added: trunk/live-installer/src/inst_live_cleanup.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/control/live-install.xml Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Mon Sep 10 13:30:40 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 10 13:29:07 CEST 2007 - jsrain(a)suse.cz + +- remove the yast2-live-installer package after live installation + (#307687) + +------------------------------------------------------------------- Wed Aug 22 17:06:42 CEST 2007 - jsrain(a)suse.cz - fixed race condition (unfortunate kill of 'dd') (#302551) Modified: trunk/live-installer/src/control/live-install.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/control/live-… ============================================================================== --- trunk/live-installer/src/control/live-install.xml (original) +++ trunk/live-installer/src/control/live-install.xml Mon Sep 10 13:30:40 2007 @@ -233,6 +233,9 @@ <name>restore_settings</name> </module> <module> + <name>inst_live_cleanup</name> + </module> + <module> <name>congratulate</name> <enable_back>yes</enable_back> <enable_next>yes</enable_next> Added: trunk/live-installer/src/inst_live_cleanup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_cle… ============================================================================== --- trunk/live-installer/src/inst_live_cleanup.ycp (added) +++ trunk/live-installer/src/inst_live_cleanup.ycp Mon Sep 10 13:30:40 2007 @@ -0,0 +1,25 @@ +/** + * + */ +{ + +import "GetInstArgs"; +import "Popup"; +import "Product"; +import "Wizard"; + +textdomain "live-installer"; + +if(GetInstArgs::going_back()) + return `auto; + +y2milestone ("Removing yast2-live-installer package"); + +map out = (map)SCR::Execute (.target.bash_output, "/bin/rpm -e yast2-live-installer"); + +if (out["exit"]:0 != 0) + y2error ("Removing yast2-live-installer failed: %1", out); + +return `auto; + +} -- 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] r40831 - in /trunk/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: fehr Date: Mon Sep 10 13:06:33 2007 New Revision: 40831 URL: http://svn.opensuse.org/viewcvs/yast?rev=40831&view=rev Log: change windows detection to cover also Vista (#307802) Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Sep 10 13:06:33 2007 @@ -5823,12 +5823,25 @@ string mdir = tmpDir() + "/tmp_mp"; unlink( mdir.c_str() ); rmdir( mdir.c_str() ); + string save_opt; + string cur_opt; + if( vol->getFs()==NTFS ) + { + save_opt = vol->getFstabOption(); + cur_opt = save_opt; + if( !cur_opt.empty() ) + cur_opt += ","; + cur_opt += "show_sys_files"; + vol->changeFstabOptions( cur_opt ); + } if( vol->getFs()!=FSUNKNOWN && mkdir( mdir.c_str(), 0700 )==0 && mountDev( device, mdir ) ) { needUmount = true; mp = mdir; } + if( vol->getFs()==NTFS ) + vol->changeFstabOptions( save_opt ); } else mp = vol->getMount(); @@ -5875,7 +5888,8 @@ } win = false; const char * files[] = { "boot.ini", "msdos.sys", "io.sys", - "config.sys", "MSDOS.SYS", "IO.SYS" }; + "config.sys", "MSDOS.SYS", "IO.SYS", + "bootmgr", "$Boot" }; string f; unsigned i=0; while( !win && i<lengthof(files) ) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Sep 10 13:06:33 2007 @@ -2,6 +2,7 @@ Mon Sep 10 12:45:37 CEST 2007 - fehr(a)suse.de - do not autodetect NFS mount in instsys (#308618) +- change windows detection to cover also Vista (#307802) ------------------------------------------------------------------- Thu Sep 6 15:40:49 CEST 2007 - fehr(a)suse.de -- 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] r40830 - /trunk/metapackage/src/OneClickInstallUI.ycp
by benjimanw＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: benjimanw Date: Mon Sep 10 12:57:41 2007 New Revision: 40830 URL: http://svn.opensuse.org/viewcvs/yast?rev=40830&view=rev Log: Fix the close button. Wizard::UserInput() is full of fail. Fixes bug 309146 Modified: trunk/metapackage/src/OneClickInstallUI.ycp Modified: trunk/metapackage/src/OneClickInstallUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallU… ============================================================================== --- trunk/metapackage/src/OneClickInstallUI.ycp (original) +++ trunk/metapackage/src/OneClickInstallUI.ycp Mon Sep 10 12:57:41 2007 @@ -702,11 +702,11 @@ symbol button = nil; repeat { - button = (symbol) Wizard::UserInput(); + button = (symbol) UI::UserInput(); handle_input(button); } until ((button != `repositoriesCheckList) && (button != `softwareCheckList)); - if ( button == `abort ) + if ( button == `abort || button == `cancel) break; if ( button == `next || button == `back ) -- 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] r40829 - in /trunk/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: fehr Date: Mon Sep 10 12:46:10 2007 New Revision: 40829 URL: http://svn.opensuse.org/viewcvs/yast?rev=40829&view=rev Log: do not autodetect NFS mount in instsys (#308618) Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Sep 10 12:46:10 2007 @@ -266,7 +266,8 @@ fstab = new EtcFstab( "/etc", isRootMounted() ); detectLoops( *ppart ); ProcMounts pm( this ); - detectNfs( pm ); + if( !instsys() ) + detectNfs( pm ); detectFsData( vBegin(), vEnd(), pm ); } EvmsCoIterator e = findEvmsCo( "" ); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Sep 10 12:46:10 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 10 12:45:37 CEST 2007 - fehr(a)suse.de + +- do not autodetect NFS mount in instsys (#308618) + +------------------------------------------------------------------- Thu Sep 6 15:40:49 CEST 2007 - fehr(a)suse.de - fix problems mounting nfs in instsys (#308200) -- 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] r40828 - in /branches/tmp/sh/mod-ui/ncurses/src: NCSelectionBox.cc NCSelectionBox.h
by gs＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: gs Date: Mon Sep 10 12:35:55 2007 New Revision: 40828 URL: http://svn.opensuse.org/viewcvs/yast?rev=40828&view=rev Log: add selectItem() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc Mon Sep 10 12:35:55 2007 @@ -31,12 +31,10 @@ : YSelectionBox( parent, nlabel ) , NCPadWidget( parent ) , biglist( false ) - , immediate( false ) { WIDDBG << endl; InitPad(); setLabel( nlabel ); - immediate = immediateMode(); } /////////////////////////////////////////////////////////////////// @@ -95,7 +93,7 @@ { if ( !myPad()->Lines() ) return -1; - NCMIL << "Current pos: " << myPad()->CurPos().L << endl; + NCDBG << "Current pos: " << myPad()->CurPos().L << endl; return myPad()->CurPos().L; } @@ -146,6 +144,42 @@ /////////////////////////////////////////////////////////////////// // // +// METHOD NAME : NCSelectionBox::selectItem +// METHOD TYPE : void +// +// DESCRIPTION : +// +void NCSelectionBox::selectItem( YItem *item, bool selected ) +{ + NCDBG << "Select item (YItem *, bool) called" << endl; + YSelectionBox::selectItem( item, selected ); + myPad()->ScrlLine( selected ? item->index() : -1 ); +} + +void NCSelectionBox::selectItem( int index ) +{ + NCDBG << "Select item (index) called" << endl; + YSelectionBox::deselectAllItems(); + YItem * item = YSelectionBox::itemAt( index ); + + if ( item ) + { +#ifdef VERBOSE_SELECTION + y2debug( "%s \"%s\": Selecting item \"%s\"", + widgetClass(), + debugLabel().c_str(), + item->label().c_str() ); +#endif + + item->setSelected( true ); + } + else + YUI_THROW( YUIException( "Can't find selected item" ) ); +} + +/////////////////////////////////////////////////////////////////// +// +// // METHOD NAME : NCSelectionBox::itemAdded // METHOD TYPE : void // @@ -243,7 +277,7 @@ NCursesEvent ret = NCursesEvent::none; int citem = getCurrentItem(); - + // handle key event first if ( sendKeyEvents() && (key == KEY_LEFT || key == KEY_RIGHT)) @@ -263,15 +297,18 @@ // call handleInput of NCPad handleInput( key ); + selectItem( getCurrentItem() ); + switch ( key ) { case KEY_SPACE: case KEY_RETURN: if ( notify() && citem != -1 ) + { return NCursesEvent::Activated; + } break; } - - if ( notify() && immediate && citem != getCurrentItem() ) { + if ( notify() && immediateMode() && citem != getCurrentItem() ) { ret = NCursesEvent::SelectionChanged; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h Mon Sep 10 12:35:55 2007 @@ -49,7 +49,6 @@ { return dynamic_cast<NCTablePad*> ( NCPadWidget::myPad () ); } bool biglist; - bool immediate; protected: @@ -85,6 +84,9 @@ virtual int getCurrentItem(); virtual void setCurrentItem( int index ); + virtual void selectItem( YItem *item, bool selected ); + virtual void selectItem( int index ); + virtual NCursesEvent wHandleInput( wint_t key ); virtual void setEnabled( bool do_bv ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0