October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66291 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: gs Date: Thu Oct 6 14:35:10 2011 New Revision: 66291 URL: http://svn.opensuse.org/viewcvs/yast?rev=66291&view=rev Log: 2.17.16 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Thu Oct 6 14:35:10 2011 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Thu Oct 6 14:35:10 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 6 12:20:02 CEST 2011 - gs(a)suse.de + +- Destroy FCoE interface before removing it (bnc #719443), + bug-fix for getting available VLAN interfaces +- V 2.17.16 + +------------------------------------------------------------------- Wed Oct 5 12:54:48 CEST 2011 - gs(a)suse.de - Write /etc/sysconfig/network/ifcfg-file for underlying interface -- 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] r66290 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: gs Date: Thu Oct 6 14:23:07 2011 New Revision: 66290 URL: http://svn.opensuse.org/viewcvs/yast?rev=66290&view=rev Log: destroy FcoE interface before removing it Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Oct 6 14:23:07 2011 @@ -357,9 +357,9 @@ // write config for FCoE VLAN interface FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card["dev_name"]:"" ); - - // store command to be able to revert the creation of FCoE VLAN interface in case of 'Cancel' - FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); + + // command to be able to revert the creation of FCoE VLAN interface in case of 'Cancel' + FcoeClient::AddRevertCommand( sformat("fcoeadm -d %1 && vconfig rem %1", fcoe_vlan_interface ) ); } else { @@ -406,45 +406,59 @@ if ( ret == true ) { y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); - - command = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; + + // call fcoeadm -d <fcoe_vlan> first (bnc #719443) + command = sformat( "fcoeadm -d %1", card["fcoe_vlan"]:"") ; y2milestone( "Calling %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); if ( output["exit"]:255 == 0 ) { - command = sformat( "rm /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); - y2milestone( "Calling %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); - command = sformat( "rm /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); + command = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; y2milestone( "Calling %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); + + if ( output["exit"]:255 == 0 ) + { + command = sformat( "rm /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + command = sformat( "rm /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); - // set new values in global map network_interfaces - card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; - card["fcoe_enable"] = ""; - card["dcb_required"] = ""; - card["auto_vlan"] = ""; - card["cfg_file"] = ""; - FcoeClient::SetModified( true ); + // set new values in global map network_interfaces + card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; + card["fcoe_enable"] = ""; + card["dcb_required"] = ""; + card["auto_vlan"] = ""; + card["cfg_file"] = ""; + FcoeClient::SetModified( true ); - FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); - y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); - // replace values in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), card["auto_vlan"]:"" ); - AdjustButtons(); + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), card["auto_vlan"]:"" ); + AdjustButtons(); + } + else + { + Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); + y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); + } } else { - Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); - y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); + Popup::Error( sformat( _("Destroying interface %1 failed."), card["fcoe_vlan"]:"") ); + y2error( "Destroying interface %1 failed", card["fcoe_vlan"]:"" ); } } } -- 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] r66289 - /tags/stable-2_21_18/packager/
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 14:16:16 2011 New Revision: 66289 URL: http://svn.opensuse.org/viewcvs/yast?rev=66289&view=rev Log: Created tag stable-2_21_18 for packager Added: tags/stable-2_21_18/packager/ (props changed) - copied from r66288, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66288 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 14:15:54 2011 New Revision: 66288 URL: http://svn.opensuse.org/viewcvs/yast?rev=66288&view=rev Log: - skip product selection in the second stage (do not reinstall the product package during autoinstallation) (bnc#721166) - 2.21.18 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=66288&r1=66… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Oct 6 14:15:54 2011 @@ -1 +1 @@ -2.21.17 +2.21.18 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Oct 6 14:15:54 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 6 11:52:02 UTC 2011 - lslezak(a)suse.cz + +- skip product selection in the second stage (do not reinstall + the product package during autoinstallation) (bnc#721166) +- 2.21.18 + +------------------------------------------------------------------- Fri Sep 23 09:05:03 UTC 2011 - lslezak(a)suse.cz - code cleanup: dropped support for selections (replaced by Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu Oct 6 14:15:54 2011 @@ -1732,6 +1732,13 @@ */ global boolean SelectProduct () { Packages::Initialize (true); + + if (Stage::cont()) + { + y2milestone("Second stage - skipping product selection"); + return true; + } + list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); if (size (products) == 0) -- 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] r66287 - /tags/branch-Code-11-SP2-2_17_93/packager/
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 14:12:33 2011 New Revision: 66287 URL: http://svn.opensuse.org/viewcvs/yast?rev=66287&view=rev Log: Created tag branch-Code-11-SP2-2_17_93 for packager Added: tags/branch-Code-11-SP2-2_17_93/packager/ (props changed) - copied from r66286, branches/SuSE-Code-11-SP2-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66286 - in /branches/SuSE-Code-11-SP2-Branch/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 14:12:25 2011 New Revision: 66286 URL: http://svn.opensuse.org/viewcvs/yast?rev=66286&view=rev Log: - skip product selection in the second stage (do not reinstall the product package during autoinstallation) (bnc#721166) - 2.17.93 Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/VERSION Thu Oct 6 14:12:25 2011 @@ -1 +1 @@ -2.17.92 +2.17.93 Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Thu Oct 6 14:12:25 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 6 11:52:02 UTC 2011 - lslezak(a)suse.cz + +- skip product selection in the second stage (do not reinstall + the product package during autoinstallation) (bnc#721166) +- 2.17.93 + +------------------------------------------------------------------- Thu Sep 8 09:12:40 UTC 2011 - lslezak(a)suse.cz - read biosdevname option directly from /proc/cmdline (bnc#712049) Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Thu Oct 6 14:12:25 2011 @@ -1703,6 +1703,13 @@ */ global boolean SelectProduct () { Packages::Initialize (true); + + if (Stage::cont()) + { + y2milestone("Second stage - skipping product selection"); + return true; + } + list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); if (size (products) == 0) -- 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] r66285 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPackageSelector.cc src/YQPackageSelector.h
by tgoettlicher＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: tgoettlicher Date: Thu Oct 6 13:40:46 2011 New Revision: 66285 URL: http://svn.opensuse.org/viewcvs/yast?rev=66285&view=rev Log: - Made settings persistant (fate #307220 ) - 2.21.9 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelector.h Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=66285&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Oct 6 13:40:46 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "8") +SET(VERSION_PATCH "9") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Oct 6 13:40:46 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 6 13:39:33 CEST 2011 - tgoettlicher(a)suse.de + +- Made settings persistant (fate #307220 ) +- 2.21.9 + +------------------------------------------------------------------- Wed Oct 5 08:34:23 CEST 2011 - tgoettlicher(a)suse.de - Applied Stano's patch to make installation history accessible Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Oct 6 13:40:46 2011 @@ -72,6 +72,7 @@ #include <QTabWidget> #include <QTimer> #include <QMenu> +#include <QSettings> #define YUILogComponent "qt-pkg" #include "YUILog.h" @@ -129,6 +130,9 @@ #define DEFAULT_EXPORT_FILE_NAME "user-packages.xml" #define FAST_SOLVER 1 +#define SETTINGS_DIR "YaST2" + + YQPackageSelector::YQPackageSelector( YWidget * parent, @@ -164,6 +168,7 @@ basicLayout(); addMenus(); // Only after all widgets are created! + loadSettings(); // Only after menus are created! makeConnections(); emit loadData(); @@ -426,6 +431,11 @@ } +YQPackageSelector::~YQPackageSelector() +{ + saveSettings(); +} + QWidget * YQPackageSelector::layoutRightPane( QWidget *parent ) { @@ -650,6 +660,8 @@ void YQPackageSelector::addMenus() { + + // // File menu // @@ -779,7 +791,6 @@ _dependencyMenu->addAction( _( "&Check Now" ), this, SLOT( manualResolvePackageDependencies() ) ); _autoDependenciesAction = new QAction( _( "&Autocheck" ), this ); _autoDependenciesAction->setCheckable( true ); - _autoDependenciesAction->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT ); _dependencyMenu->addAction( _autoDependenciesAction ); @@ -797,7 +808,6 @@ _showDevelAction = _optionsMenu->addAction( _( "Show -de&vel Packages" ), this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); _showDevelAction->setCheckable(true); - _showDevelAction->setChecked(true); _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDevelPkgs ); @@ -807,7 +817,6 @@ _showDebugAction = _optionsMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); _showDebugAction->setCheckable(true); - _showDebugAction->setChecked(true); _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); @@ -816,27 +825,21 @@ _verifySystemModeAction = _optionsMenu->addAction( _( "&System Verification Mode" ), this, SLOT( pkgVerifySytemModeChanged( bool ) ) ); _verifySystemModeAction->setCheckable(true); - _verifySystemModeAction->setChecked( zypp::getZYpp()->resolver()->systemVerification() ); _ignoreAlreadyRecommendAction = _optionsMenu->addAction( _( "&Ignore Recommended Packages for Already Installed Packages" ), this, SLOT( pkgIgnoreAlreadyRecommendedChanged( bool ) ) ); _ignoreAlreadyRecommendAction->setCheckable(true); - _ignoreAlreadyRecommendAction->setChecked( zypp::getZYpp()->resolver()->ignoreAlreadyRecommended() ); + _cleanDepsOnRemoveAction = _optionsMenu->addAction( _( "&Cleanup when deleting packages" ), this, SLOT( pkgCleanDepsOnRemoveChanged( bool ) ) ); _cleanDepsOnRemoveAction->setCheckable(true); - _cleanDepsOnRemoveAction->setChecked( zypp::getZYpp()->resolver()->cleandepsOnRemove() ); - - _allowVendorChangeAction = _optionsMenu->addAction( _( "&Allow vendor change" ), this, SLOT( pkgAllowVendorChangeChanged( bool ) ) ); _allowVendorChangeAction->setCheckable(true); - _allowVendorChangeAction->setChecked( zypp::getZYpp()->resolver()->allowVendorChange() ); - @@ -1693,5 +1696,45 @@ YQPkgChangesDialog::OptionNone ); // showIfEmpty } +void +YQPackageSelector::loadSettings() +{ + QSettings settings( QSettings::UserScope, SETTINGS_DIR ); + + _autoDependenciesAction->setChecked( settings.value("Options/AutocheckDependencies", + AUTO_CHECK_DEPENDENCIES_DEFAULT ).toBool() ) ; + + _showDevelAction->setChecked(settings.value("Options/showDevelPackages", true).toBool()); + + _showDebugAction->setChecked(settings.value("Options/showDebugPackages", true).toBool()); + + _verifySystemModeAction->setChecked( settings.value("Options/systemVerificationMode", + zypp::getZYpp()->resolver()->systemVerification() ).toBool() ); + + _ignoreAlreadyRecommendAction->setChecked( settings.value("Options/IgnoreRecommendedPackagesForAlreadyInstalledPackages", + zypp::getZYpp()->resolver()->ignoreAlreadyRecommended() ).toBool() ); + + _cleanDepsOnRemoveAction->setChecked( settings.value("Options/CleanupWhenDeletingPackages", + zypp::getZYpp()->resolver()->cleandepsOnRemove()).toBool() ); + + _allowVendorChangeAction->setChecked( settings.value("Options/AllowVendorChange", + zypp::getZYpp()->resolver()->allowVendorChange() ).toBool() ); + +} + +void +YQPackageSelector::saveSettings() +{ + QSettings settings( QSettings::UserScope, SETTINGS_DIR ); + + settings.setValue("Options/AutocheckDependencies", _autoDependenciesAction->isChecked() ); + settings.setValue("Options/showDevelPackages", _showDevelAction->isChecked() ); + settings.setValue("Options/showDebugPackages", _showDebugAction->isChecked() ); + settings.setValue("Options/systemVerificationMode", _verifySystemModeAction->isChecked() ); + settings.setValue("Options/IgnoreRecommendedPackagesForAlreadyInstalledPackages", _ignoreAlreadyRecommendAction->isChecked() ); + settings.setValue("Options/CleanupWhenDeletingPackages", _cleanDepsOnRemoveAction->isChecked() ); + settings.setValue("Options/AllowVendorChange", _allowVendorChangeAction->isChecked() ); + +} #include "YQPackageSelector.moc" Modified: trunk/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.h (original) +++ trunk/qt-pkg/src/YQPackageSelector.h Thu Oct 6 13:40:46 2011 @@ -89,6 +89,7 @@ public: YQPackageSelector( YWidget * parent, long modeFlags = 0 ); + ~YQPackageSelector(); public slots: @@ -191,6 +192,16 @@ */ void updateRepositoryUpgradeLabel(); + /** + * loads settings for the checkboxes in the option menu + */ + void loadSettings(); + + /** + * saves settings of the checkboxes in the option menu + */ + void saveSettings(); + signals: /** -- 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] r66284 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp
by fehr＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: fehr Date: Thu Oct 6 12:49:44 2011 New Revision: 66284 URL: http://svn.opensuse.org/viewcvs/yast?rev=66284&view=rev Log: remove jfs completely from fs list (bnc#720483) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp 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 Thu Oct 6 12:49:44 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 6 12:36:26 CEST 2011 - fehr(a)suse.de + +- remove jfs completely from fs list (bnc#720483) + +------------------------------------------------------------------- Wed Oct 5 16:50:39 CEST 2011 - fehr(a)suse.de - fix invalid proposal on EFI system where GPT disklabel creation Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Thu Oct 6 12:49:44 2011 @@ -61,7 +61,7 @@ // filesystems possible for root volume. used during scan for root volumes. - global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ]; + global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs ]; global list<string> system_m_points() { return [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; } @@ -172,7 +172,7 @@ `ext3 : true, `ext4 : true, `btrfs : true, - `jfs : true, + `jfs : false, `vfat : true, `ntfs : true, `xxefi : false, @@ -183,7 +183,7 @@ `lvm : true ]; - list<symbol> unsupportFs = [ `jfs ]; + list<symbol> unsupportFs = []; global define list<map<symbol, any> > GetGeneralFstabOptions() -- 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] r66283 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp
by fehr＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: fehr Date: Thu Oct 6 12:37:52 2011 New Revision: 66283 URL: http://svn.opensuse.org/viewcvs/yast?rev=66283&view=rev Log: remove jfs completely from fs list (bnc#720483) Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Oct 6 12:37:52 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 6 12:36:26 CEST 2011 - fehr(a)suse.de + +- remove jfs completely from fs list (bnc#720483) + +------------------------------------------------------------------- Wed Oct 5 16:50:39 CEST 2011 - fehr(a)suse.de - fix invalid proposal on EFI system where GPT disklabel creation Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Thu Oct 6 12:37:52 2011 @@ -61,7 +61,7 @@ // filesystems possible for root volume. used during scan for root volumes. - global const list<symbol> possible_root_fs = [ `ext2, `ext3, `btrfs, `reiser, `xfs, `jfs ]; + global const list<symbol> possible_root_fs = [ `ext2, `ext3, `btrfs, `reiser, `xfs ]; global list<string> system_m_points() { return [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; } @@ -172,7 +172,7 @@ `ext3 : true, `ext4 : false, `btrfs : true, - `jfs : true, + `jfs : false, `vfat : true, `ntfs : true, `xxefi : false, @@ -183,7 +183,7 @@ `lvm : true ]; - list<symbol> unsupportFs = [ `jfs ]; + list<symbol> unsupportFs = []; global define list<map<symbol, any> > GetGeneralFstabOptions() -- 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] r66282 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 12:25:47 2011 New Revision: 66282 URL: http://svn.opensuse.org/viewcvs/yast?rev=66282&view=rev Log: added support for configured but not detected joysticks (i.e. disconnected or with a wrong driver) Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Thu Oct 6 12:25:47 2011 @@ -246,10 +246,33 @@ return s; } + define string broken_id(integer index) + { + return sformat("broken_%1", index); + } + + define boolean is_broken(string id) + { + return regexpmatch(id, "broken_[0-9]+"); + } + + define integer broken_index(string id) + { + string num = regexpsub(id, "broken_([0-9]+)", "\\1"); + + if (num == nil) + { + return nil; + } + + return tointeger(num); + } + define list<map<string,any> > joystick_table() { list<map<string,any> > content = []; list<map> soundcards = (list<map>)SCR::Read(.probe.sound); + list<integer> found_joysticks = []; foreach(map js, Joystick::Detected(), { @@ -282,9 +305,25 @@ bus = sformat("%1 (%2)", bus, card["model"]:""); } - map j_config = find(map j, (list<map>)Joystick::joystick, {return j["attached_to"]:"" == unique_key;}); - if (j_config != nil) + integer i = 0; + integer joy_index = nil; + + while(i < 4) { + map jconf = Joystick::joystick[i]:$[]; + + if (jconf["attached_to"]:"" == unique_key) + { + joy_index = i; + break; + } + + i = i + 1; + } + + if (joy_index != nil) + { + map j_config = find(map j, (list<map>)Joystick::joystick, {return j["attached_to"]:"" == unique_key;}); string config_model = j_config["model"]:""; if (config_model != nil && config_model != "") @@ -293,6 +332,8 @@ model = sformat("%1 (%2)", model, config_model); } + + found_joysticks = add(found_joysticks, joy_index); } } @@ -305,6 +346,45 @@ content = add(content, j); }); + y2milestone("Found joysticks at indices: %1", found_joysticks); + + integer i = 0; + // check non-working joystick configurations + foreach(map js, (list<map>)Joystick::joystick, { + if (!contains(found_joysticks, i) && js["JOYSTICK_MODULE"]:"" != "") + { + y2milestone("Found inactive joystick configuration at index %1: %2", i, js); + string model = js["model"]:_("Unknown joystick model"); + string unique_key = js["attached_to"]:""; + string bus = "Gameport"; + + map card = find(map c, soundcards, {return c["unique_key"]:"" == unique_key;}); + + if (card != nil) + { + // joystick details, %1 is the sound card name to which is the joystick connected + bus = sformat("%1 (%2)", bus, card["model"]:""); + } + + map<string,any> j = $[ + "id" : broken_id(i), + // the joystick device was not found (the joystick is probably disconnected) + "table_descr" : [ model, _("<not found>"), bus ], + // add red warning about invalid configuration to the model name (%1) + "rich_descr" : WizardHW::CreateRichTextDescription(sformat(_("%1 - Invalid configuration"), model), [ + // help text + _("The configuration is not active - either the joystick is not connected or a wrong driver is used"), + // help text + _("Press Edit to change the joystick driver or Delete to remove the configuration") + ]) + ]; + + content = add(content, j); + } + + i = i + 1; + }); + return content; } @@ -679,11 +759,22 @@ } else { - string uid = find_joystick(device)["parent_unique_key"]:""; - integer num = find_joystick_number(uid); - list<map> soundcards = (list<map>)SCR::Read(.probe.sound); - map card = find(map c, soundcards, {return c["unique_key"]:"" == uid;}); + integer num = nil; + string key = ""; + if (is_broken(device)) + { + key = Joystick::joystick[num, "attached_to"]:""; + num = broken_index(device); + } + else + { + key = find_joystick(device)["parent_unique_key"]:""; + num = find_joystick_number(key); + } + + list<map> soundcards = (list<map>)SCR::Read(.probe.sound); + map card = find(map c, soundcards, {return c["unique_key"]:"" == key;}); symbol ui = joy_dialog(num, `ok, card); if (ui == `next || ui == `finish) @@ -705,7 +796,9 @@ } else { - integer num = find_joystick_number(find_joystick(device)["parent_unique_key"]:""); + integer num = is_broken(device) ? broken_index(device) + : find_joystick_number(find_joystick(device)["parent_unique_key"]:""); + y2milestone("Deleting joystick %1 (index %2)", device, num); // modify joystick config @@ -721,7 +814,15 @@ } else if (ret == `test) { - test_joystick(device); + if (is_broken(device)) + { + // error popup + Popup::Error(_("The selected joystick configuration is not active.\n\nThe joystick cannot be tested.")); + } + else + { + test_joystick(device); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0