January 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67236 - in /trunk/slide-show/SuSELinux/pic: 12_novell.png 12_suse.png
by keichwa＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: keichwa Date: Thu Jan 19 16:48:58 2012 New Revision: 67236 URL: http://svn.opensuse.org/viewcvs/yast?rev=67236&view=rev Log: s/novell/suse/ Added: trunk/slide-show/SuSELinux/pic/12_suse.png - copied unchanged from r67235, trunk/slide-show/SuSELinux/pic/12_novell.png Removed: trunk/slide-show/SuSELinux/pic/12_novell.png -- 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] r67235 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgList.cc
by tgoettlicher＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: tgoettlicher Date: Thu Jan 19 16:22:46 2012 New Revision: 67235 URL: http://svn.opensuse.org/viewcvs/yast?rev=67235&view=rev Log: fixed bnc#734763 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=67235&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Jan 19 16:22:46 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "16") +SET(VERSION_PATCH "18") 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 Jan 19 16:22:46 2012 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Thu Jan 19 16:19:19 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc #734763: yast2 sw_single software management with QT ui + resets columns in software view when horizontal scrollbar is removed + (Patch from Frank SchÃ¤fer) + +- Version: 2.21.18 + + +------------------------------------------------------------------- +Thu Jan 19 16:10:52 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#723151: Install all matching debuginfo packages" never + finds anything-debuginfo-32bit +- Fixed bnc#730007: When updating packages, + keyshortcut doesn't + always work + +- Version: 2.21.17 + +------------------------------------------------------------------- Wed Dec 7 10:05:26 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=6723… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Thu Jan 19 16:22:46 2012 @@ -449,7 +449,10 @@ void YQPkgList::resizeEvent(QResizeEvent *event) { - optimizeColumnWidths(); + if (event->size().width() != event->oldSize().width()) + optimizeColumnWidths(); + /* NOTE: avoids column width optimization when the size changes + because the horizontal scroll bar appeares/disappeares */ event->accept(); } -- 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] r67234 - in /trunk/qt-pkg/src: YQPackageSelector.cc YQPkgList.cc YQPkgObjList.cc YQPkgObjList.h YQPkgPatchList.cc
by tgoettlicher＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: tgoettlicher Date: Thu Jan 19 16:10:43 2012 New Revision: 67234 URL: http://svn.opensuse.org/viewcvs/yast?rev=67234&view=rev Log: fixed bnc#723151: Install all matching debuginfo packages" never finds anything-debuginfo-32bit fixed bnc#730007: When updating packages, + keyshortcut doesn't always work Modified: trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgList.cc trunk/qt-pkg/src/YQPkgObjList.cc trunk/qt-pkg/src/YQPkgObjList.h trunk/qt-pkg/src/YQPkgPatchList.cc 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 Jan 19 16:10:43 2012 @@ -696,6 +696,7 @@ _pkgMenu->addAction(_pkgList->actionSetCurrentKeepInstalled); _pkgMenu->addAction(_pkgList->actionSetCurrentDelete); _pkgMenu->addAction(_pkgList->actionSetCurrentUpdate); + _pkgMenu->addAction(_pkgList->actionSetCurrentUpdateForce); _pkgMenu->addAction(_pkgList->actionSetCurrentTaboo); _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); @@ -757,6 +758,7 @@ _patchMenu->addAction(_patchList->actionSetCurrentDelete); #endif _patchMenu->addAction(_patchList->actionSetCurrentUpdate); + _patchMenu->addAction(_patchList->actionSetCurrentUpdateForce); _patchMenu->addAction(_patchList->actionSetCurrentTaboo); _patchMenu->addSeparator(); @@ -809,7 +811,7 @@ this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); _showDevelAction->setCheckable(true); - _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); + _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*(\\d+bit)?-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDevelPkgs ); _excludeDevelPkgs->enable( false ); @@ -817,7 +819,7 @@ _showDebugAction = _optionsMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); _showDebugAction->setCheckable(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() ); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*(-\\d+bit)?-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() ); YUI_CHECK_NEW( _excludeDebugInfoPkgs ); _excludeDebugInfoPkgs->enable( false ); @@ -1610,7 +1612,7 @@ { QString name = (*it)->name().c_str(); - if ( name.endsWith( suffix ) ) + if ( name.endsWith( suffix ) || name.endsWith( suffix + "-32bit" ) ) { subPkgs[ name ] = *it; Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=6723… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Thu Jan 19 16:10:43 2012 @@ -482,6 +482,7 @@ _installedContextMenu->addAction(actionSetCurrentKeepInstalled); _installedContextMenu->addAction(actionSetCurrentDelete); _installedContextMenu->addAction(actionSetCurrentUpdate); + _installedContextMenu->addAction(actionSetCurrentUpdateForce); _installedContextMenu->addAction(actionSetCurrentProtected); _installedContextMenu->addAction(actionShowCurrentSolverInfo); Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=6… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Thu Jan 19 16:10:43 2012 @@ -77,6 +77,7 @@ , actionSetCurrentKeepInstalled(0) , actionSetCurrentDelete(0) , actionSetCurrentUpdate(0) + , actionSetCurrentUpdateForce(0) , actionSetCurrentTaboo(0) , actionSetCurrentProtected(0) , actionShowCurrentSolverInfo(0) @@ -286,7 +287,7 @@ void -YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem ) +YQPkgObjList::setCurrentStatus( ZyppStatus newStatus, bool doSelectNextItem, bool ifNewerOnly ) { QTreeWidgetItem * listViewItem = currentItem(); @@ -295,7 +296,7 @@ YQPkgObjListItem * item = dynamic_cast<YQPkgObjListItem *> (listViewItem); - if ( item && item->editable() && _editable ) + if ( item && item->editable() && _editable && ( item->candidateIsNewer() || !ifNewerOnly ) ) { if ( newStatus != item->status() ) { @@ -401,6 +402,10 @@ actionSetCurrentKeepInstalled = createAction( S_KeepInstalled, "[<], [-]" ); actionSetCurrentDelete = createAction( S_Del, "[-]" ); actionSetCurrentUpdate = createAction( S_Update, "[>], [+]" ); + actionSetCurrentUpdateForce = createAction( _( "Update unconditionally" ), statusIcon( S_Update, true ) ,statusIcon( S_Update, false ) , "", true ) ; + + + actionSetCurrentTaboo = createAction( S_Taboo, "[!]" ); actionSetCurrentProtected = createAction( S_Protected, "[*]" ); @@ -431,6 +436,7 @@ connect( actionSetCurrentKeepInstalled, SIGNAL( activated() ), this, SLOT( setCurrentKeepInstalled() ) ); connect( actionSetCurrentDelete, SIGNAL( activated() ), this, SLOT( setCurrentDelete() ) ); connect( actionSetCurrentUpdate, SIGNAL( activated() ), this, SLOT( setCurrentUpdate() ) ); + connect( actionSetCurrentUpdateForce, SIGNAL( activated() ), this, SLOT( setCurrentUpdateForce() ) ); connect( actionSetCurrentTaboo, SIGNAL( activated() ), this, SLOT( setCurrentTaboo() ) ); connect( actionSetCurrentProtected, SIGNAL( activated() ), this, SLOT( setCurrentProtected() ) ); connect( actionShowCurrentSolverInfo, SIGNAL( activated() ), this, SLOT( showCurrentSolverInfo() ) ); @@ -538,6 +544,7 @@ _installedContextMenu->addAction( actionSetCurrentKeepInstalled ); _installedContextMenu->addAction( actionSetCurrentDelete ); _installedContextMenu->addAction( actionSetCurrentUpdate ); + _installedContextMenu->addAction( actionSetCurrentUpdateForce ); _installedContextMenu->addAction( actionShowCurrentSolverInfo ); addAllInListSubMenu( _installedContextMenu ); @@ -605,6 +612,7 @@ actionSetCurrentKeepInstalled->setEnabled( true ); actionSetCurrentDelete->setEnabled( true ); actionSetCurrentUpdate->setEnabled( selectable->hasCandidateObj() ); + actionSetCurrentUpdateForce->setEnabled( selectable->hasCandidateObj() ); } else { @@ -616,6 +624,7 @@ actionSetCurrentKeepInstalled->setEnabled( false ); actionSetCurrentDelete->setEnabled( false ); actionSetCurrentUpdate->setEnabled( false ); + actionSetCurrentUpdateForce->setEnabled( false ); } actionShowCurrentSolverInfo->setEnabled( true ); } @@ -628,6 +637,7 @@ actionSetCurrentKeepInstalled->setEnabled( false ); actionSetCurrentDelete->setEnabled( false ); actionSetCurrentUpdate->setEnabled( false ); + actionSetCurrentUpdateForce->setEnabled( false ); actionSetCurrentProtected->setEnabled( false ); actionShowCurrentSolverInfo->setEnabled( false ); @@ -1104,6 +1114,7 @@ } + void YQPkgObjListItem::setStatus( ZyppStatus newStatus, bool sendSignals ) { Modified: trunk/qt-pkg/src/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.h?rev=67… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.h (original) +++ trunk/qt-pkg/src/YQPkgObjList.h Thu Jan 19 16:10:43 2012 @@ -119,7 +119,9 @@ * Automatically selects the next item if 'selectNextItem' is 'true'. **/ void setCurrentStatus( ZyppStatus newStatus, - bool selectNextItem = false ); + bool selectNextItem = false, + bool ifNewerOnly = false ); + /** * Show solver information about the current selected item @@ -262,7 +264,8 @@ void setCurrentDontInstall() { setCurrentStatus( S_NoInst ); } void setCurrentKeepInstalled() { setCurrentStatus( S_KeepInstalled ); } void setCurrentDelete() { setCurrentStatus( S_Del ); } - void setCurrentUpdate() { setCurrentStatus( S_Update ); } + void setCurrentUpdate() { setCurrentStatus( S_Update, false, true ); } + void setCurrentUpdateForce() { setCurrentStatus( S_Update ); } void setCurrentTaboo() { setCurrentStatus( S_Taboo ); } void setCurrentProtected() { setCurrentStatus( S_Protected ); } @@ -401,6 +404,7 @@ QAction * actionSetCurrentKeepInstalled; QAction * actionSetCurrentDelete; QAction * actionSetCurrentUpdate; + QAction * actionSetCurrentUpdateForce; QAction * actionSetCurrentTaboo; QAction * actionSetCurrentProtected; QAction * actionShowCurrentSolverInfo; @@ -498,6 +502,7 @@ **/ virtual void setStatus( ZyppStatus newStatus, bool sendSignals = true ); + /** * Set a status icon according to the package's status. **/ Modified: trunk/qt-pkg/src/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchList.cc?rev… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatchList.cc Thu Jan 19 16:10:43 2012 @@ -407,6 +407,7 @@ #endif _installedContextMenu->addAction(actionSetCurrentUpdate); + _installedContextMenu->addAction(actionSetCurrentUpdateForce); _installedContextMenu->addAction(actionSetCurrentProtected); addAllInListSubMenu( _installedContextMenu ); -- 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] r67233 - /tags/stable-2_22_2/ldap-client/
by jsuchome＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: jsuchome Date: Thu Jan 19 15:37:06 2012 New Revision: 67233 URL: http://svn.opensuse.org/viewcvs/yast?rev=67233&view=rev Log: Created tag stable-2_22_2 for ldap-client Added: tags/stable-2_22_2/ldap-client/ - copied from r67232, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67232 - in /trunk/ldap-client: ./ package/ src/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: jsuchome Date: Thu Jan 19 15:36:33 2012 New Revision: 67232 URL: http://svn.opensuse.org/viewcvs/yast?rev=67232&view=rev Log: - removed obsolete version 2 reference (fate#313143) - confirmed license - 2.22.2 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ldap-client.ycp trunk/ldap-client/src/ldap.ycp trunk/ldap-client/src/ldap_auto.ycp trunk/ldap-client/src/ldap_browser.ycp trunk/ldap-client/src/ldap_client.rnc trunk/ldap-client/src/ldap_config.ycp trunk/ldap-client/src/routines.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/src/wizards.ycp trunk/ldap-client/testsuite/tests/Export.out trunk/ldap-client/testsuite/tests/Export2.out trunk/ldap-client/testsuite/tests/Export3.out trunk/ldap-client/testsuite/tests/LDAPInit.out trunk/ldap-client/testsuite/tests/LDAPInit.ycp trunk/ldap-client/testsuite/tests/Read.out trunk/ldap-client/testsuite/tests/Read2.out trunk/ldap-client/yast2-ldap-client.spec.in Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67232&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jan 19 15:36:33 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jan 19 15:36:33 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 19 14:56:43 CET 2012 - jsuchome(a)suse.cz + +- removed obsolete version 2 reference (fate#313143) +- confirmed license +- 2.22.2 + +------------------------------------------------------------------- Wed Nov 16 15:35:53 CET 2011 - jsuchome(a)suse.cz - correctly handle sssd config with more LDAP servers (bnc#729174) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=672… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/Ldap.ycp * Module: Configuration of LDAP client @@ -108,8 +128,6 @@ string old_base_dn = nil; boolean base_dn_changed = false; - /* Do we have an v2 or v3 ldap server? */ - global boolean ldap_v2 = false; global boolean ldap_tls = false; // CA certificates for server certificate verification @@ -432,7 +450,6 @@ server = settings ["ldap_server"]:""; // leaving "ldap_domain" for backward compatibility base_dn = settings ["ldap_domain"]:""; - ldap_v2 = settings ["ldap_v2"]:false; ldap_tls = settings ["ldap_tls"]:false; pam_password = settings ["pam_password"]:"exop"; bind_dn = settings ["bind_dn"]:""; @@ -487,7 +504,6 @@ "start_ldap" : start, "ldap_server" : server, "ldap_domain" : base_dn, - "ldap_v2" : ldap_v2, "ldap_tls" : ldap_tls, "bind_dn" : bind_dn, "file_server" : file_server, @@ -551,7 +567,7 @@ // summary item summary = Summary::AddHeader(summary, _("System Security Services Daemon (SSSD) Set")); - // summary (LDAP version 2?) + // summary (SSSD Set?) summary = Summary::AddLine(summary, (sssd && start) ? _("Yes") : Summary::NotConfigured()); return summary; @@ -832,7 +848,6 @@ } } - ldap_v2 = (ReadLdapConfEntry ("ldap_version", "3") == "2"); ldap_tls = (ReadLdapConfEntry ("ssl", "no") == "start_tls"); tls_cacertdir = ReadLdapConfEntry ("tls_cacertdir", ""); tls_cacertfile = ReadLdapConfEntry ("tls_cacertfile", ""); @@ -1155,7 +1170,6 @@ map args = $[ "hostname": GetFirstServer (server), "port": GetFirstPort (server), - "version": ldap_v2 ? 2 : 3, "use_tls": ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile": Ldap::tls_cacertfile @@ -1336,7 +1350,6 @@ args = $[ "hostname" : GetFirstServer (server), "port" : GetFirstPort (server), - "version" : ldap_v2 ? 2 : 3, "use_tls" : ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -2711,11 +2724,6 @@ WriteOpenLdapConf(); - if (ldap_v2) - WriteLdapConfEntry ("ldap_version", "2"); - else - WriteLdapConfEntry ("ldap_version", "3"); - if (ldap_tls) WriteLdapConfEntry ("ssl", "start_tls"); else Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/LdapPopup.ycp * Package: Configuration of LDAP @@ -189,7 +209,6 @@ map args = size (connection) > 0 ? connection : $[ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : Ldap::ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile": Ldap::tls_cacertfile Modified: trunk/ldap-client/src/ldap-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap-client.ycp?… ============================================================================== --- trunk/ldap-client/src/ldap-client.ycp (original) +++ trunk/ldap-client/src/ldap-client.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Author: Jiri Suchomel <jsuchome(a)suse.cz> * Summary: Just a redirection Modified: trunk/ldap-client/src/ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap.ycp?rev=672… ============================================================================== --- trunk/ldap-client/src/ldap.ycp (original) +++ trunk/ldap-client/src/ldap.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap.ycp * Module: Configuration of LDAP client Modified: trunk/ldap-client/src/ldap_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_auto.ycp?re… ============================================================================== --- trunk/ldap-client/src/ldap_auto.ycp (original) +++ trunk/ldap-client/src/ldap_auto.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap_auto.ycp * Package: Configuration of LDAP client Modified: trunk/ldap-client/src/ldap_browser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.ycp… ============================================================================== --- trunk/ldap-client/src/ldap_browser.ycp (original) +++ trunk/ldap-client/src/ldap_browser.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap/ldap_browser.ycp * Package: Configuration of LDAP Modified: trunk/ldap-client/src/ldap_client.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_client.rnc?… ============================================================================== --- trunk/ldap-client/src/ldap_client.rnc (original) +++ trunk/ldap-client/src/ldap_client.rnc Thu Jan 19 15:36:33 2012 @@ -9,7 +9,6 @@ ldap_domain? & ldap_server? & ldap_tls? & - ldap_v2? & create_ldap? & start_ldap? & member_attribute? & @@ -33,7 +32,6 @@ file_server = element file_server { BOOLEAN } ldap_tls = element ldap_tls { BOOLEAN } -ldap_v2 = element ldap_v2 { BOOLEAN } start_ldap = element start_ldap { BOOLEAN } create_ldap = element create_ldap { BOOLEAN } start_autofs = element start_autofs { BOOLEAN } Modified: trunk/ldap-client/src/ldap_config.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_config.ycp?… ============================================================================== --- trunk/ldap-client/src/ldap_config.ycp (original) +++ trunk/ldap-client/src/ldap_config.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap.ycp * Module: Configuration of LDAP client Modified: trunk/ldap-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/routines.ycp?rev… ============================================================================== --- trunk/ldap-client/src/routines.ycp (original) +++ trunk/ldap-client/src/routines.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/ldap/routines.ycp * Package: Configuration of LDAP Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67232… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/ldap/ui.ycp * Package: Configuration of LDAP @@ -376,7 +396,6 @@ LdapPopup::InitAndBrowseTree ("", $[ "hostname" : Ldap::GetFirstServer (server), "port" : Ldap::GetFirstPort (server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -552,7 +571,6 @@ map args = $[ "hostname" : Ldap::GetFirstServer (server), "port" : Ldap::GetFirstPort (server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -679,13 +697,7 @@ "), "member") + - _("If secure connection requires certificate checking, specify where your\ncertificate file is located. Enter either a directory containing certificates\nor the explicit path to one certificate file.") + - - // help text 7/9 - _("Normally, the LDAP version 3 protocol is used. If you have -an LDAP server using protocol 2 (for example, OpenLDAP v1), activate -LDAP Version 2. -"), + _("If secure connection requires certificate checking, specify where your\ncertificate file is located. Enter either a directory containing certificates\nor the explicit path to one certificate file."), `admin : @@ -746,7 +758,6 @@ string nss_base_shadow = Ldap::nss_base_shadow; string nss_base_group = Ldap::nss_base_group; string pam_password = Ldap::pam_password; - boolean ldap_v2 = Ldap::ldap_v2; string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; string krb5_realm = Ldap::krb5_realm; @@ -985,9 +996,7 @@ `PushButton (`id(`br_tls_cacertfile), _("Brows&e")) ) )) - ), - `VSpacing(0.2), - `Left (`CheckBox (`id(`ldapv), _("LDAP &Version 2"), ldap_v2)) + ) ), `HSpacing (5))); UI::ReplaceWidget (`tabContents, cont); @@ -1120,7 +1129,6 @@ tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); tls_cacertdir = (string) UI::QueryWidget(`id(`tls_cacertdir), `Value); - ldap_v2 = (boolean) UI::QueryWidget(`id(`ldapv), `Value); } if (current == `admin) { @@ -1160,7 +1168,6 @@ LdapPopup::InitAndBrowseTree (base_dn, $[ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : Ldap::ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile": Ldap::tls_cacertfile @@ -1236,7 +1243,6 @@ string suf = LdapPopup::InitAndBrowseTree (base_dn, $[ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : Ldap::ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -1368,7 +1374,6 @@ Ldap::nss_base_passwd != nss_base_passwd || Ldap::nss_base_group != nss_base_group || Ldap::nss_base_shadow != nss_base_shadow || - Ldap::ldap_v2 != ldap_v2 || Ldap::tls_cacertdir != tls_cacertdir || Ldap::tls_cacertfile != tls_cacertfile || Ldap::krb5_realm != krb5_realm || @@ -1387,7 +1392,6 @@ Ldap::nss_base_passwd = nss_base_passwd; Ldap::nss_base_group = nss_base_group; Ldap::nss_base_shadow = nss_base_shadow; - Ldap::ldap_v2 = ldap_v2; Ldap::tls_cacertdir = tls_cacertdir; Ldap::tls_cacertfile = tls_cacertfile; Ldap::krb5_realm = krb5_realm; Modified: trunk/ldap-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-client/src/wizards.ycp (original) +++ trunk/ldap-client/src/wizards.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/ldap-client/wizards.ycp * Package: Configuration of ldap-client Modified: trunk/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.out (original) +++ trunk/ldap-client/testsuite/tests/Export.out Thu Jan 19 15:36:33 2012 @@ -2,7 +2,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil @@ -21,4 +20,4 @@ Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export2.out (original) +++ trunk/ldap-client/testsuite/tests/Export2.out Thu Jan 19 15:36:33 2012 @@ -1,7 +1,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil @@ -24,4 +23,4 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" Read .etc.sssd_conf.v."domain/default"."enumerate" "true" Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export3.out (original) +++ trunk/ldap-client/testsuite/tests/Export3.out Thu Jan 19 15:36:33 2012 @@ -1,7 +1,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil @@ -24,4 +23,4 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" Read .etc.sssd_conf.v."domain/default"."enumerate" "true" Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz,kdc.suse.de", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz,kdc.suse.de", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/LDAPInit.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAP… ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.out (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.out Thu Jan 19 15:36:33 2012 @@ -1,16 +1,16 @@ Dump ==== init (one server, no port set) ============== Dump ==== value of server: "localhost" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no", "version":3] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true Return Dump ==== init (one server, nonsence port set) ======== Dump ==== value of server: "localhost:sdgfd#$" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no", "version":3] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true Return Dump ==== init (more servers set, TLS used) =========== Dump ==== value of server: "chimera.suse.cz:333 localhost" -Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] true +Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "hostname":"chimera.suse.cz", "port":333, "use_tls":"yes"] true Return Dump ==== init failed ================================= -Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] false +Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "hostname":"chimera.suse.cz", "port":333, "use_tls":"yes"] false Read .ldap.error $["code":11, "msg":"Initialization failed"] Return Initialization failed Modified: trunk/ldap-client/testsuite/tests/LDAPInit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAP… ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.ycp (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.ycp Thu Jan 19 15:36:33 2012 @@ -47,7 +47,6 @@ DUMP ("==== init (more servers set, TLS used) ==========="); Ldap::server = "chimera.suse.cz:333 localhost"; - Ldap::ldap_v2 = true; Ldap::ldap_tls = true; Ldap::tls_cacertdir = "/etc/ssl/certs"; Modified: trunk/ldap-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.out (original) +++ trunk/ldap-client/testsuite/tests/Read.out Thu Jan 19 15:36:33 2012 @@ -1,7 +1,6 @@ Dump ==== reading... ============================ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil Modified: trunk/ldap-client/testsuite/tests/Read2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read2.out (original) +++ trunk/ldap-client/testsuite/tests/Read2.out Thu Jan 19 15:36:33 2012 @@ -1,6 +1,5 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil Modified: trunk/ldap-client/yast2-ldap-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/yast2-ldap-client.sp… ============================================================================== --- trunk/ldap-client/yast2-ldap-client.spec.in (original) +++ trunk/ldap-client/yast2-ldap-client.spec.in Thu Jan 19 15:36:33 2012 @@ -2,8 +2,8 @@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite yast2-network PreReq: %fillup_prereq -- 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] r67231 - in /trunk/ruby-bindings: package/yast2-ruby-bindings.changes src/ruby/Y2RubyComponent.cc
by jreidinger＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: jreidinger Date: Thu Jan 19 13:15:21 2012 New Revision: 67231 URL: http://svn.opensuse.org/viewcvs/yast?rev=67231&view=rev Log: improve previous fix to allow loading also file in namespace (e.g. Name::Test in name/test ) (bnc#705417) Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby… ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Thu Jan 19 13:15:21 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 19 12:11:56 UTC 2012 - jreidinger(a)suse.com + +- improve previous fix to allow loading also file in namespace ( + e.g. Name::Test in name/test ) (bnc#705417) + +------------------------------------------------------------------- Mon Jan 16 15:16:39 UTC 2012 - coolo(a)suse.com - license should be GPL-2.0 without or later Modified: trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyCom… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc Thu Jan 19 13:15:21 2012 @@ -84,7 +84,14 @@ size_t size = res.size(); if (size==0) return res; - res[0] = tolower(res[0]); //first character breaks rule with replace upper with _lower + res[0] = tolower(res[0]); + //first character and first char after :: is lowercase without underscore + for(size_t i = res.find("::",i+1); i!= string::npos; i = res.find("::",i+1)) + { + size_t c_pos = i+2; //::<c> so we want c + if (c_pos >= size) break; //handle string finishing with :: + res[c_pos] = tolower(res[c_pos]); + } for (size_t i = 1; i< res.size();i++) { if (isupper(res[i])) -- 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] r67230 - in /trunk/storage: package/yast2-storage.changes storage/src/inst_disk_proposal.ycp
by aschnell＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: aschnell Date: Thu Jan 19 11:54:02 2012 New Revision: 67230 URL: http://svn.opensuse.org/viewcvs/yast?rev=67230&view=rev Log: - improved layout for small screens (bnc#740006) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_disk_proposal.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 Jan 19 11:54:02 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 19 10:52:02 GMT 2012 - aschnell(a)suse.de + +- improved layout for small screens (bnc#740006) + +------------------------------------------------------------------- Tue Jan 10 18:59:52 CET 2012 - fehr(a)suse.de - fix parsing problem with old style size values (e.g. 10G instead Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_pr… ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Thu Jan 19 11:54:02 2012 @@ -211,29 +211,24 @@ term bframe = `VBox( `PushButton( `id(`detailed), detailed_str ), - `VSpacing(0.45), + `VSpacing(0.2), `PushButton( `id(`import), import_str ), - `VSpacing(0.45), + `VSpacing(0.2), `PushButton( `id(`modify), modify_str ) ); float space = StorageProposal::SaveHeight()?1:2; term contents = - `VBox( - `VSpacing(0.5), - `HBox( - `HSpacing(2), + `MarginBox(2, 0.4, `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), rframe, `VSpacing(space), bframe, `VStretch() - ), - `HSpacing(2) - ), - `VSpacing(2) ); + ) + ); // help on suggested partitioning -- 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] r67229 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/inst_disk_proposal.ycp
by aschnell＠svn2.opensuse.org 19 Jan '12

19 Jan '12

Author: aschnell Date: Thu Jan 19 11:53:52 2012 New Revision: 67229 URL: http://svn.opensuse.org/viewcvs/yast?rev=67229&view=rev Log: - improved layout for small screens (bnc#740006) Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.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 Jan 19 11:53:52 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 19 10:52:02 GMT 2012 - aschnell(a)suse.de + +- improved layout for small screens (bnc#740006) + +------------------------------------------------------------------- Wed Jan 11 16:10:33 CET 2012 - fehr(a)suse.de - 2.17.124 Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp Thu Jan 19 11:53:52 2012 @@ -187,29 +187,24 @@ term bframe = `VBox( `PushButton( `id(`detailed), detailed_str ), - `VSpacing(0.45), + `VSpacing(0.2), `PushButton( `id(`import), import_str ), - `VSpacing(0.45), + `VSpacing(0.2), `PushButton( `id(`modify), modify_str ) ); float space = StorageProposal::SaveHeight()?1:2; term contents = - `VBox( - `VSpacing(0.5), - `HBox( - `HSpacing(2), + `MarginBox(2, 0.4, `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), rframe, `VSpacing(space), bframe, `VStretch() - ), - `HSpacing(2) - ), - `VSpacing(2) ); + ) + ); // help on suggested partitioning -- 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] r67228 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp fcoe-client_finish.ycp inst_fcoe-client.ycp wizards.ycp
by gs＠svn2.opensuse.org 18 Jan '12

18 Jan '12

Author: gs Date: Wed Jan 18 14:11:36 2012 New Revision: 67228 URL: http://svn.opensuse.org/viewcvs/yast?rev=67228&view=rev Log: merge SuSE-Code-11-SP2-Branch (V 2.17.24) to trunk Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/fcoe-client_finish.ycp trunk/fcoe-client/src/inst_fcoe-client.ycp trunk/fcoe-client/src/wizards.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed Jan 18 14:11:36 2012 @@ -272,45 +272,55 @@ } // -// Check whether a VLAN interface is configured for FCoE on the switch (for given interface) +// Check whether VLAN interfaces are configured for FCoE on the switch // // Params: // string interface network interface card, e.g. eth3 // Return: // string Vlan interface number, e.g. 200 // Example: -// # fipvlan eth3 +// # fipvlan eth0 eth1 eth2 eth3 //Fibre Channel Forwarders Discovered //interface | VLAN | FCF MAC //------------------------------------------ -//eth3 | 200 | 00:0d:ec:a2:ef:00 +//eth0 | 200 | 00:0d:ec:a2:ef:00 +//eth3 | 200 | 00:0d:ec:a2:ef:01 // -global string GetVlanInterface( string interface ) +global map GetVlanInterfaces( list net_devices ) { - string vlan_interface = ""; - map output = $[]; + // Add option -u (or --link_up): don't shut down interfaces + // to be able to detect DCB state afterwards (see bnc #737683) + string vlan_cmd = "LANG=POSIX fipvlan -u"; + map vlan_info = $[]; - // check whether there is a VLAN interface which is configured for FCoE - string cmd_fcoe = sformat( "LANG=POSIX fipvlan %1", interface ); - y2milestone( "Executing command: %1", cmd_fcoe ); - output = (map)SCR::Execute( .target.bash_output, cmd_fcoe ); + foreach ( string dev, (list<string>)net_devices, { + vlan_cmd = vlan_cmd + " " + dev; + } ); + + // call fipvlan command for all interfaces (saves time because is executed in parallel) + y2milestone( "Executing command: %1", vlan_cmd ); + map output = (map)SCR::Execute( .target.bash_output, vlan_cmd ); y2milestone( "Output: %1", output ); - + list <string> lines = splitstring( output["stdout"]:"", "\n" ); - foreach( string line, (list<string>)lines, { - // check whether there is a line for the given interface, e.g. - // eth3 | 200 | 00:0d:ec:a2:ef:00\n - // and extract name/number of VLAN channel. - if ( String::StartsWith( line, interface ) ) - { - line = deletechars( line, " \t" ); - vlan_interface = substring( line, findfirstof( line, "|" )+1, - findlastof( line, "|" )-findfirstof( line, "|")-1 ); - y2milestone( "VLAN: %1", vlan_interface ); - } + + foreach ( string dev, (list<string>)net_devices, { + foreach( string line, (list<string>)lines, { + // check whether there is a line for the given interface, e.g. + // eth3 | 200 | 00:0d:ec:a2:ef:00\n + // and extract name/number of VLAN channel. + if ( String::StartsWith( line, dev ) ) + { + line = deletechars( line, " \t" ); + string vlan_interface = substring( line, findfirstof( line, "|" )+1, + findlastof( line, "|" )-findfirstof( line, "|")-1 ); + y2milestone( "Interface: %1 VLAN: %2", dev, vlan_interface ); + vlan_info = add( vlan_info, dev, vlan_interface ); + } + } ); } ); - - return vlan_interface; + y2milestone( "VLAN info: %1", vlan_info ); + return vlan_info; } // @@ -443,7 +453,7 @@ if ( !FileUtils::Exists( file_name ) ) { y2warning( "Cannot read config file for %1 in /etc/fcoe", vlan_device_name ); - Popup::Warning( sformat(_("Cannot read config file for %1. + Report::Warning( sformat(_("Cannot read config file for %1. You may edit the settings and recreate the FCoE VLAN interface to get a valid configuration."), vlan_device_name) ); return status_map; @@ -517,20 +527,32 @@ // global void AdjustStartStatus( ) { - y2milestone( "Setting start of /etc/init.d/boot.fcoe to %1", service_start["fcoe"]:false ); - if ( service_start["fcoe"]:false == true ) - Service::Enable("boot.fcoe"); - else - Service::Disable("boot.fcoe"); + boolean fcoe_start = service_start["fcoe"]:false; + boolean lldpad_start = service_start["lldpad"]:false; + y2milestone( "Setting start of /etc/init.d/boot.fcoe to %1", fcoe_start ); + y2milestone( "Setting start of /etc/init.d/lldpad to %1", lldpad_start ); - y2milestone( "Setting start of /etc/init.d/lldpad to %1", service_start["lldpad"]:false ); - if ( service_start["lldpad"]:false == true ) - Service::Enable("boot.lldpad"); - else + if ( fcoe_start && lldpad_start ) + { + Service::Enable("boot.lldpad"); // enable 'lldpad' first + Service::Enable("boot.fcoe"); + } + else if ( !fcoe_start && lldpad_start ) + { + Service::Disable("boot.fcoe"); + Service::Enable("boot.lldpad" ); + } + else if ( !fcoe_start && !lldpad_start ) + { + Service::Disable("boot.fcoe"); // disable 'fcoe' first Service::Disable("boot.lldpad"); - + } + // fcoe_start && !lldpad_start isn't possible -> see complex.ycp StoreServicesDialog } +// +// Set status of services +// global void SetStartStatus( string service, boolean status ) { y2milestone( "Starting service %1 on boot: %2", service, status ); @@ -563,51 +585,56 @@ // global boolean ServiceStatus() { + boolean success = true; + // Loading of modules in Stage::initial() is not required (like in IsciClientLib.ycp, line 523 ) // see /etc/init.d/fcoe, line 85 (modprobe fcoe > /dev/null 2>&1) boolean ret = true; - - if ( Service::Status( "boot.fcoe" ) != 0 ) + + // first start lldpad + if ( Service::Status( "boot.lldpad" ) != 0 ) { - boolean success = Service::Start( "boot.fcoe" ); + success = Service::Start( "boot.lldpad" ); if ( success ) { - y2milestone( "FCoE started (/etc/init.d/boot.fcoe start)"); - fcoe_started = true;; + y2milestone( "Lldpad started (/etc/init.d/boot.lldpad start)"); + lldpad_started = true; } else { - y2error( "Cannot start FCoE service - '/etc/init.d/boot.fcoe start' failed" ); - Popup::Error( "Cannot start FCoE service. -'/etc/init.d/boot.fcoe start' failed" ); + y2error( "Cannot start service lldpad - '/etc/init.d/boot.lldpad start' failed" ); + Report::Error( "Cannot start service lldpad. +'/etc/init.d/boot.lldpad start' failed" ); ret = false; } } else { - y2milestone( "FCoE service is running"); + y2milestone( "Lldpad service is running"); } - if ( Service::Status( "boot.lldpad" ) != 0 ) + if ( Service::Status( "boot.fcoe" ) != 0 ) { - boolean success = Service::Start( "boot.lldpad" ); + success = Service::Start( "boot.fcoe" ); + if ( success ) { - y2milestone( "Lldpad started (/etc/init.d/boot.lldpad start)"); - lldpad_started = true; + y2milestone( "FCoE started (/etc/init.d/boot.fcoe start)"); + fcoe_started = true;; } else { - y2error( "Cannot start service lldpad - '/etc/init.d/boot.lldpad start' failed" ); - Popup::Error( "Cannot start service lldpad. -'/etc/init.d/boot.lldpad start' failed" ); + y2error( "Cannot start FCoE service - '/etc/init.d/boot.fcoe start' failed" ); + Report::Error( "Cannot start FCoE service. +'/etc/init.d/boot.fcoe start' failed" ); ret = false; } } else { - y2milestone( "Lldpad service is running"); + y2milestone( "FCoE service is running"); } + return ret; } @@ -625,46 +652,31 @@ if ( netcards == [] || netcards == nil ) return false; + list net_devices = []; + foreach ( map card, netcards, { - // get first state map from link list in resource map - map state_map = card["resource", "link", 0 ]:$[]; + net_devices = add( net_devices, card["dev_name"]:"" ); + }); - if ( state_map["state"]:false == false ) - { - // call 'ifconfig <interface> up' here because it's not yet - // clear who configures the interfaces (fipvlan command itself?) - // -> see bnc #705171 (this applies also to installed system) - string cmd_ifup = sformat( "ifconfig %1 up", card["dev_name"]:"" ); - y2milestone( "Executing command: %1", cmd_ifup ); - SCR::Execute( .target.bash_output, cmd_ifup ); - - // ifconfig up always returns 0 -> no error message can be made - } - } ); - // call .probe.netcard again - netcards = (list<map>)SCR::Read(.probe.netcard); + // The 'fipvlan' command which is called in GetVlanInterfaces configures the interfaces itself, + // therefore it's not needed any longer to call 'ifconfig <if> up' here. + map vlan_info = GetVlanInterfaces( net_devices ); foreach ( map card, netcards, { - map state_map = card["resource", "link", 0]:$[]; map info_map = $[]; map <string, string> status_map = $[]; - string vlan_interface = ""; string fcoe_vlan_interface = ""; string dcb_capable = ""; + string dcb_default = ""; - // only call 'fipvlan <interface>' for configured interfaces - if ( state_map["state"]:false == true ) - { - vlan_interface = GetVlanInterface( card["dev_name"]:"" ); - } - if ( vlan_interface == "" ) + if ( vlan_info[card["dev_name"]:""]:"" == "" ) { // Interface down or FCoE not enabled on the switch - we can't do anything here. fcoe_vlan_interface = NOT_AVAILABLE; } else { - fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); + fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_info[card["dev_name"]:""]:"" ); if ( fcoe_vlan_interface != "" ) { @@ -682,7 +694,7 @@ } } dcb_capable = DCBCapable( card["dev_name"]:"" ); - + info_map = add( info_map, "dev_name", card["dev_name"]:""); // network card, e.g. eth3 if ( card["device"]:"" != "" ) { @@ -699,22 +711,34 @@ { // default for FCoE enable is yes info_map = add( info_map, "fcoe_enable", status_map["FCOE_ENABLE"]:"yes" ); // FCOE_ENABLE - // default for DCB required is yes unless the interface is not dcb capable - info_map = add( info_map, "dcb_required", status_map["DCB_REQUIRED"]:( (dcb_capable=="yes")?"yes":"no" ) ); - // default is to create /etc/fcoe/cfg-ethx file with VLAN device in name - // (e.g. cfg-eth3.200), set AUTO_VLAN to "no" then (see bnc #692403) - info_map = add( info_map, "auto_vlan", status_map["AUTO_VLAN"]:"no"); // AUTO_VLAN + + // exception for Broadcom cards: DCB_REQUIRED should be set to "no" (bnc #728658) + if ( (card["driver"]:"" != "bnx2x") && (dcb_capable == "yes") ) + { + dcb_default = "yes"; + } + else + { + dcb_default = "no"; + } + info_map = add( info_map, "dcb_required", status_map["DCB_REQUIRED"]:dcb_default ); + + // default is AUTO_VLAN="yes", create /etc/fcoe/cfg-ethx file without VLAN device in name + // (e.g. /etc/fcoe/cfg-eth3), see bnc #724563 + info_map = add( info_map, "auto_vlan", status_map["AUTO_VLAN"]:"yes"); // AUTO_VLAN } info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable - info_map = add( info_map, "vlan_interface", vlan_interface ); // VLAN interface, e.g. 200 + info_map = add( info_map, "vlan_interface", vlan_info[card["dev_name"]:""]:"" ); // VLAN interface, e.g. 200 info_map = add( info_map, "cfg_file", status_map["cfg_device"]:"" ); // part of cfg-file name, e.g. eth3.200 network_interfaces = add( network_interfaces, info_map ); } ); + // sort the list of interfaces (eth0, eth1, eth2...) network_interfaces = sort( map a, map b, network_interfaces, { return ( a["dev_name"]:"" < b["dev_name"]:"" ); - } ); + } ); + return true; } @@ -769,7 +793,7 @@ boolean success = true; foreach ( map card, (list<map>)netcards, { - if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured + if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { y2milestone( "Writing /etc/sysconfig/network/ifcfg-%1", card["fcoe_vlan"]:"" ); @@ -778,18 +802,29 @@ SCR::Write(.network.value + card["fcoe_vlan"]:"" + "STARTMODE", "nfsroot" ); SCR::Write(.network.value + card["fcoe_vlan"]:"" + "ETHERDEVICE", card["dev_name"]:"" ); SCR::Write(.network.value + card["fcoe_vlan"]:"" + "USERCONTROL", "no" ); - y2milestone( "Writing /etc/sysconfig/network/ifcfg-%1", card["dev_name"]:"" ); + + string ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", card["dev_name"]:"" ); + y2milestone( "Writing %1", ifcfg_file ); + // write /etc/sysconfig/network/ifcfg-<interface> (underlying interface), e.g. ifcfg-eth3 - SCR::Write(.network.value + card["dev_name"]:"" + "BOOTPROTO", "static" ); - SCR::Write(.network.value + card["dev_name"]:"" + "STARTMODE", "nfsroot" ); - SCR::Write(.network.value + card["dev_name"]:"" + "NAME", card["device"]:"" ); + if ( !FileUtils::Exists(ifcfg_file) ) + { + SCR::Write(.network.value + card["dev_name"]:"" + "BOOTPROTO", "static" ); + SCR::Write(.network.value + card["dev_name"]:"" + "STARTMODE", "nfsroot" ); + SCR::Write(.network.value + card["dev_name"]:"" + "NAME", card["device"]:"" ); + } + else + { + // don't overwrite BOOTPROTO !!! + SCR::Write(.network.value + card["dev_name"]:"" + "STARTMODE", "nfsroot" ); + } } } ); // This is very important- it flushes the cache, and stores the configuration on the disk success = SCR::Write( .network, nil ); if ( !success ) { - y2error( "Error writing /etc/sysconfig/network/ifcfg-<fcoe-interface>" ); + y2error( "Error writing /etc/sysconfig/network/ifcfg-files" ); } return success; } @@ -894,7 +929,7 @@ /* Progress stage 3/3 */ _("Detect network cards"), /* Progress stage 4/4 */ - _("Read /etc/fcoe/config") + _("Read /etc/fcoe/config" ) ], [ /* Progress step 1/3 */ _("Checking for installed packages..."), @@ -903,7 +938,7 @@ /* Progress step 3/3 */ _("Detecting network cards..."), /* Progress step 4/4 */ - _("Reading /etc/fcoe/config"), + _("Reading /etc/fcoe/config" ), /* Progress finished */ _("Finished") ], @@ -1020,8 +1055,7 @@ success = WriteCfgFiles(); if( !success ) Report::Error (_("Cannot write settings for FCoE interfaces. -For details, see /var/log/YaST2/y2log. -") ); +For details, see /var/log/YaST2/y2log.") ); if(PollAbort()) return false; Progress::NextStage(); @@ -1038,7 +1072,6 @@ if( !success ) Report::Error (_("Cannot write /etc/sysconfig/network/ifcfg-files.")); sleep(sl); - // adjust service start of lldpad and fcoe if(PollAbort()) return false; Progress::NextStage (); Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Wed Jan 18 14:11:36 2012 @@ -54,11 +54,11 @@ y2milestone( "Aborting FCoE configuration" ); // revert start of 'fcoe' or 'lldpad' - if ( FcoeClient::fcoe_started ) + if ( FcoeClient::fcoe_started && !Service::Enabled( "boot.fcoe" ) ) { Service::Stop( "boot.fcoe" ); } - if ( FcoeClient::lldpad_started ) + if ( FcoeClient::lldpad_started && !Service::Enabled( "boot.lldpad" ) ) { Service::Stop( "boot.lldpad" ); } @@ -82,7 +82,12 @@ y2milestone( "Calling %1", command ); map output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); - + if ( output["exit"]:255 != 0 ) + { + // text of an error popup + Popup::Error( sformat( _("Cannot remove the FCoE interface. +Command %1 failed."), command ) ); + } } ); FcoeClient::ResetRevertCommands(); // important during installation } @@ -236,6 +241,12 @@ UI::ChangeWidget( `id(`fcoe), `Value, card["fcoe_enable"]:"" ); UI::ChangeWidget( `id(`dcb), `Value, card["dcb_required"]:"" ); UI::ChangeWidget( `id(`auto), `Value, card["auto_vlan"]:"" ); + if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) + { + // don't allow to change AUTO_VLAN for a configured interface + // (would require new /etc/fcoe/cfg-file) + UI::ChangeWidget( `id(`auto), `Enabled, false ); + } // headline of the edit dialog - configuration of values for a certain network interface UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of Interface %1"), card["fcoe_vlan"]:"" ) ); } @@ -280,7 +291,6 @@ string command = ""; map output = $[]; - string vlan_interface = ""; string fcoe_vlan_interface = ""; map status_map = $[]; @@ -346,8 +356,8 @@ y2milestone( "Starting FCoE canceled" ); return nil; } - - // Get values and exchange list (table) entry + + // Get values and exchange list (table) entries fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", card["vlan_interface"]:"" ); if ( fcoe_vlan_interface != "" ) @@ -358,7 +368,10 @@ status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card["dev_name"]:"" ); // 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 ) ); + // FcoeClient::AddRevertCommand( sformat("fcoeadm -d %1 && vconfig rem %2", status_map["cfg_device"]:"", fcoe_vlan_interface ) ); + // 'fcoeadm -d <if>/<if>.<vlan>' fails here, 'vconfig rem <if>.<vlan>' succeeds + // and removes the interface properly (tested on RC1) + FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); } else { @@ -389,25 +402,35 @@ map output = $[]; string command = ""; // popup text: really remove FCoE VLAN interface - string popup_text = sformat( _("Do you really want to remove the FCoE VLAN device %1?"), + string popup_text = sformat( _("Do you really want to remove the FCoE interface %1?"), card["fcoe_vlan"]:"" ); if ( !Stage::initial() ) { // popup text continues - popup_text = popup_text + "\n" + _("Please note: The device won't be restored on 'Cancel'."); + popup_text = popup_text + "\n" + _("Attention: +Make sure the interface is not essential for a used device. +Removing it may result in an unusable system."); + } + else + { + // popup text continues + popup_text = popup_text + "\n" + _("Don't remove the interface if it's related +to an already activated multipath device."); } - // headline of a popup - boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN Device"), - popup_text ); + boolean ret = Popup::AnyQuestion( Label::WarningMsg(), + popup_text, + Label::ContinueButton(), + Label::CancelButton(), + `focus_no ); // default: Cancel if ( ret == true ) { y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); // call fcoeadm -d <fcoe_vlan> first (bnc #719443) - command = sformat( "fcoeadm -d %1", card["fcoe_vlan"]:"") ; + command = sformat( "fcoeadm -d %1", card["cfg_file"]:"") ; y2milestone( "Calling %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); @@ -433,8 +456,9 @@ // set new values in global map network_interfaces card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; card["fcoe_enable"] = "yes"; - card["dcb_required"] = (card["dcb_capable"]:""=="yes")?"yes":"no"; - card["auto_vlan"] = "no"; + // exception for Broadcom cards: DCB_REQUIRED should be set to "no" (bnc #728658) + card["dcb_required"] = ((card["driver"]:"" != "bnx2x") && (card["dcb_capable"]:""=="yes"))?"yes":"no"; + card["auto_vlan"] = "yes"; // default is "yes" (bnc #724563) card["cfg_file"] = ""; FcoeClient::SetModified( true ); @@ -450,7 +474,7 @@ } else { - Popup::Error( sformat( _("Removing of interface %1 failed."), card["fcoe_vlan"]:"") ); + Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); } } @@ -483,8 +507,7 @@ { // text of a warning popup Popup::Warning( _("DCB Required is set to \"yes\" but the -interface isn't DCB capable. -") ); +interface isn't DCB capable.") ); y2warning( "DCB_REQUIRED is set to yes but the interface isn't DCB capable" ); } } @@ -505,6 +528,14 @@ boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("lldpad_startup_auto"), `Value ); + if ( fcoe_auto && !lldpad_auto ) + { + // text of an information (notify) popup + Popup::Notify( _( "Service 'fcoe' requires enabled service 'lldpad'. +Enabling start on boot of service 'lldpad'." ) ); + lldpad_auto = true; + } + FcoeClient::SetStartStatus( "lldpad", lldpad_auto ); y2milestone( "Setting auto start of service 'lldpad' to: %1", lldpad_auto ); } Modified: trunk/fcoe-client/src/fcoe-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/fcoe-client_fini… ============================================================================== --- trunk/fcoe-client/src/fcoe-client_finish.ycp (original) +++ trunk/fcoe-client/src/fcoe-client_finish.ycp Wed Jan 18 14:11:36 2012 @@ -109,8 +109,9 @@ if ( start_services ) { y2milestone( "Enabling service start of fcoe and lldpad" ); - Service::Enable("boot.fcoe"); + // service lldpad has to be enabled first Service::Enable("boot.lldpad"); + Service::Enable("boot.fcoe"); } } else Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Wed Jan 18 14:11:36 2012 @@ -101,9 +101,10 @@ // workflow not aborted if ( ret == `next ) { - // add package open-fcoe to the pool that is used by software proposal - y2milestone( "Adding package open-fcoe to pool" ); - PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe"] ); + // add packages open-fcoe (requires lldpad) and yast2-fcoe-client + // to the pool that is used by software proposal + y2milestone( "Adding packages open-fcoe and yast2-fcoe-client to pool" ); + PackagesProposal::AddResolvables( "fcoe", `package, ["open-fcoe", "yast2-fcoe-client"] ); // write changes to config files y2milestone( "Writing FCoE config files"); FcoeClient::WriteFcoeConfig(); Modified: trunk/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/wizards.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/wizards.ycp (original) +++ trunk/fcoe-client/src/wizards.ycp Wed Jan 18 14:11:36 2012 @@ -172,7 +172,7 @@ Wizard::SetAbortButton(`abort, Label::CancelButton()); Wizard::HideBackButton(); - // TODO: rename icon to yast2-fcoe-client (yast2-theme package) + // TODO: rename icon to yast-fcoe (yast2-theme package) if (Mode::normal ()) Wizard::SetDesktopTitleAndIcon("fcoe-client"); else -- 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] r67227 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 16:01:03 2012 New Revision: 67227 URL: http://svn.opensuse.org/viewcvs/yast?rev=67227&view=rev Log: - ask user to confirm new licenses at upgrade proposal (bnc#741174) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Tue Jan 17 16:01:03 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 17 14:02:21 UTC 2012 - lslezak(a)suse.cz + +- ask user to confirm new licenses at upgrade proposal (bnc#741174) + +------------------------------------------------------------------- Mon Jan 2 13:11:06 UTC 2012 - lslezak(a)suse.cz - install also all applicable patches (except optional ones) Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Tue Jan 17 16:01:03 2012 @@ -493,6 +493,13 @@ // set the solve error flag for packages proposal Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); + if (!AcceptLicenses()) + { + // rerun the solver after rejecting a package license + // (setting the package to taboo state) + Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); + } + already_proposed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67226 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 16:00:28 2012 New Revision: 67226 URL: http://svn.opensuse.org/viewcvs/yast?rev=67226&view=rev Log: - install also all applicable patches (except optional ones) (part of fate#311994) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Tue Jan 17 16:00:28 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 2 13:11:06 UTC 2012 - lslezak(a)suse.cz + +- install also all applicable patches (except optional ones) + (part of fate#311994) + +------------------------------------------------------------------- Wed Dec 21 09:56:24 UTC 2011 - lslezak(a)suse.cz - force product upgrade in full migratinon mode, handle product Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Tue Jan 17 16:00:28 2012 @@ -474,6 +474,10 @@ map <string, any> update_conf = GetUpdateConf(); map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + + // also preselect all applicable patches (except optional ones) + integer patches = Pkg::ResolvablePreselectPatches(`all); + y2milestone("Preselected patches: %1", patches); } else { -- 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] r67225 - /tags/branch-Code-11-SP2-2_17_30/wagon/
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 15:36:49 2012 New Revision: 67225 URL: http://svn.opensuse.org/viewcvs/yast?rev=67225&view=rev Log: Created tag branch-Code-11-SP2-2_17_30 for wagon Added: tags/branch-Code-11-SP2-2_17_30/wagon/ (props changed) - copied from r67224, branches/SuSE-Code-11-SP2-Branch/wagon/ -- 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] r67224 - in /branches/SuSE-Code-11-SP2-Branch/wagon: VERSION package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 15:36:44 2012 New Revision: 67224 URL: http://svn.opensuse.org/viewcvs/yast?rev=67224&view=rev Log: - ask user to confirm new licenses at upgrade proposal (bnc#741174) - 2.17.30 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Tue Jan 17 15:36:44 2012 @@ -1 +1 @@ -2.17.29 +2.17.30 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Tue Jan 17 15:36:44 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 17 14:02:21 UTC 2012 - lslezak(a)suse.cz + +- ask user to confirm new licenses at upgrade proposal (bnc#741174) +- 2.17.30 + +------------------------------------------------------------------- Mon Jan 2 13:11:06 UTC 2012 - lslezak(a)suse.cz - install also all applicable patches (except optional ones) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Tue Jan 17 15:36:44 2012 @@ -492,6 +492,13 @@ // set the solve error flag for packages proposal Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); + if (!AcceptLicenses()) + { + // rerun the solver after rejecting a package license + // (setting the package to taboo state) + Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); + } + already_proposed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67223 - /tags/branch-Code-11-SP1-2_17_17_7/wagon/
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 15:36:01 2012 New Revision: 67223 URL: http://svn.opensuse.org/viewcvs/yast?rev=67223&view=rev Log: Created tag branch-Code-11-SP1-2_17_17_7 for wagon Added: tags/branch-Code-11-SP1-2_17_17_7/wagon/ (props changed) - copied from r67222, branches/SuSE-Code-11-SP1-Branch/wagon/ -- 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] r67222 - /tags/branch-Code-11-SP1-2_17_17_7/
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 15:35:57 2012 New Revision: 67222 URL: http://svn.opensuse.org/viewcvs/yast?rev=67222&view=rev Log: Created tag branch-Code-11-SP1-2_17_17_7 Added: tags/branch-Code-11-SP1-2_17_17_7/ -- 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] r67221 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: lslezak Date: Tue Jan 17 15:35:53 2012 New Revision: 67221 URL: http://svn.opensuse.org/viewcvs/yast?rev=67221&view=rev Log: - ask user to confirm new licenses at upgrade proposal (bnc#741174) - 2.17.17.7 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Tue Jan 17 15:35:53 2012 @@ -1 +1 @@ -2.17.17.6 +2.17.17.7 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Tue Jan 17 15:35:53 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 17 14:02:21 UTC 2012 - lslezak(a)suse.cz + +- ask user to confirm new licenses at upgrade proposal (bnc#741174) +- 2.17.17.7 + +------------------------------------------------------------------- Mon Jan 2 13:11:06 UTC 2012 - lslezak(a)suse.cz - install also all applicable patches (except optional ones) Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Tue Jan 17 15:35:53 2012 @@ -492,6 +492,13 @@ // set the solve error flag for packages proposal Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); + if (!AcceptLicenses()) + { + // rerun the solver after rejecting a package license + // (setting the package to taboo state) + Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); + } + already_proposed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67220 - /tags/branch-Code-11-SP2-2_17_17/pos-installation/
by jsuchome＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: jsuchome Date: Tue Jan 17 14:43:37 2012 New Revision: 67220 URL: http://svn.opensuse.org/viewcvs/yast?rev=67220&view=rev Log: Created tag branch-Code-11-SP2-2_17_17 for pos-installation Added: tags/branch-Code-11-SP2-2_17_17/pos-installation/ (props changed) - copied from r67219, branches/SuSE-Code-11-SP2-Branch/pos-installation/ -- 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] r67219 - in /branches/SuSE-Code-11-SP2-Branch/pos-installation: VERSION package/yast2-pos-installation.changes src/clients/firstboot_slepos_installation.ycp
by jsuchome＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: jsuchome Date: Tue Jan 17 14:43:12 2012 New Revision: 67219 URL: http://svn.opensuse.org/viewcvs/yast?rev=67219&view=rev Log: - only allow to continue when init script ended correctly (bnc#730186) - 2.17.17 Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-i… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION Tue Jan 17 14:43:12 2012 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-i… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes Tue Jan 17 14:43:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 17 14:31:47 CET 2012 - jsuchome(a)suse.cz + +- only allow to continue when init script ended correctly + (bnc#730186) +- 2.17.17 + +------------------------------------------------------------------- Mon Dec 12 12:49:22 CET 2011 - jsuchome(a)suse.cz - show failure notice when script exits with non-zero (bnc#730186) Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-i… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/firstboot_slepos_installation.ycp Tue Jan 17 14:43:12 2012 @@ -171,7 +171,11 @@ } Wizard::EnableBackButton (); - Wizard::EnableNextButton (); + // only allow to continue when script ended correctly + if (exit_status == 0) + { + Wizard::EnableNextButton (); + } while (true) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67218 - /tags/stable-2_22_0/ncurses-pkg/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 13:57:40 2012 New Revision: 67218 URL: http://svn.opensuse.org/viewcvs/yast?rev=67218&view=rev Log: Created tag stable-2_22_0 for ncurses-pkg Added: tags/stable-2_22_0/ncurses-pkg/ - copied from r67217, trunk/ncurses-pkg/ -- 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] r67217 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes yast2-ncurses-pkg.spec.in
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 13:57:17 2012 New Revision: 67217 URL: http://svn.opensuse.org/viewcvs/yast?rev=67217&view=rev Log: Confirmed license Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=67217&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Tue Jan 17 13:57:17 2012 @@ -1 +1 @@ -2.21.2 +2.22.0 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Tue Jan 17 13:57:17 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 17 13:55:34 CET 2012 - gs(a)suse.de + +- Confirmed license +- 2.22.0 + +------------------------------------------------------------------- Fri Nov 25 12:22:31 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/yast2-ncurses-pkg.sp… ============================================================================== --- trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in (original) +++ trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Tue Jan 17 13:57:17 2012 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL-2.0+ +License: GPL-2.0 BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools libtool BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel yast2-ncurses-devel @@ -37,3 +37,6 @@ @plugindir@/libpy2ncurses_pkg.so.* @plugindir@/libpy2ncurses_pkg.so %doc @docdir@ + +%changelog + -- 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] r67216 - /trunk/ncurses-pkg/src/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 13:42:49 2012 New Revision: 67216 URL: http://svn.opensuse.org/viewcvs/yast?rev=67216&view=rev Log: Copyright header added Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.h trunk/ncurses-pkg/src/NCPackageSelectorStart.cc trunk/ncurses-pkg/src/NCPackageSelectorStart.h trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h trunk/ncurses-pkg/src/NCPkgFilterLocale.cc trunk/ncurses-pkg/src/NCPkgFilterLocale.h trunk/ncurses-pkg/src/NCPkgFilterMain.cc trunk/ncurses-pkg/src/NCPkgFilterMain.h trunk/ncurses-pkg/src/NCPkgFilterPattern.cc trunk/ncurses-pkg/src/NCPkgFilterPattern.h trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.h trunk/ncurses-pkg/src/NCPkgFilterRepo.cc trunk/ncurses-pkg/src/NCPkgFilterRepo.h trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.h trunk/ncurses-pkg/src/NCPkgMenuAction.cc trunk/ncurses-pkg/src/NCPkgMenuAction.h trunk/ncurses-pkg/src/NCPkgMenuConfig.cc trunk/ncurses-pkg/src/NCPkgMenuConfig.h trunk/ncurses-pkg/src/NCPkgMenuDeps.cc trunk/ncurses-pkg/src/NCPkgMenuDeps.h trunk/ncurses-pkg/src/NCPkgMenuExtras.cc trunk/ncurses-pkg/src/NCPkgMenuExtras.h trunk/ncurses-pkg/src/NCPkgMenuFilter.cc trunk/ncurses-pkg/src/NCPkgMenuFilter.h trunk/ncurses-pkg/src/NCPkgMenuHelp.cc trunk/ncurses-pkg/src/NCPkgMenuHelp.h trunk/ncurses-pkg/src/NCPkgMenuView.cc trunk/ncurses-pkg/src/NCPkgMenuView.h trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgPackageDetails.h trunk/ncurses-pkg/src/NCPkgPatchSearch.cc trunk/ncurses-pkg/src/NCPkgPatchSearch.h trunk/ncurses-pkg/src/NCPkgPopupDeps.cc trunk/ncurses-pkg/src/NCPkgPopupDeps.h trunk/ncurses-pkg/src/NCPkgPopupDescr.cc trunk/ncurses-pkg/src/NCPkgPopupDescr.h trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h trunk/ncurses-pkg/src/NCPkgPopupTable.cc trunk/ncurses-pkg/src/NCPkgPopupTable.h trunk/ncurses-pkg/src/NCPkgSearchSettings.cc trunk/ncurses-pkg/src/NCPkgSearchSettings.h trunk/ncurses-pkg/src/NCPkgSelMapper.cc trunk/ncurses-pkg/src/NCPkgSelMapper.h trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc trunk/ncurses-pkg/src/NCPkgStatusStrategy.h trunk/ncurses-pkg/src/NCPkgStrings.cc trunk/ncurses-pkg/src/NCPkgStrings.h trunk/ncurses-pkg/src/NCPkgTable.cc trunk/ncurses-pkg/src/NCPkgTable.h trunk/ncurses-pkg/src/NCZypp.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorStart.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorStart.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPackageSelectorStart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorStart.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorStart.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterInstS… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterInstS… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterLocale.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterLocal… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterLocale.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterLocale.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterLocale.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterLocal… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterLocale.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterLocale.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterMain.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterMain.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterMain.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterMain.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterMain.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterMain.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterMain.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterMain.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterPattern.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterPatte… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterPattern.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterPattern.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterPattern.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterPatte… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterPattern.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterPattern.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRPMGr… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRPMGr… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterRepo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRepo.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRepo.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRepo.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterRepo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRepo.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRepo.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRepo.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuAction.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuAction.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuAction.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuAction.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuAction.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuAction.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuConfig.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuConfig.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuConfig.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuConfig.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuConfig.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuConfig.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuConfig.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuConfig.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.cc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuDeps.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.h?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuDeps.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuDeps.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuExtras.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuExtras.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuExtras.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuExtras.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuExtras.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuExtras.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuFilter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuFilter.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuFilter.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuFilter.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuFilter.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuFilter.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuFilter.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuFilter.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuHelp.cc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuHelp.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuHelp.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuHelp.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuHelp.h?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuHelp.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuHelp.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuView.cc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuView.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuView.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgMenuView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuView.h?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuView.h (original) +++ trunk/ncurses-pkg/src/NCPkgMenuView.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.h (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPatchSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPatchSearch… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPatchSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPatchSearch.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPatchSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPatchSearch… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPatchSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgPatchSearch.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDeps.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupDeps.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDeps.h… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDeps.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDeps.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupDescr.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDescr.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDescr.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDescr.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupDescr.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDescr.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDescr.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDescr.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDisksp… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDisksp… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupTable.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupTable.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgPopupTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupTable.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupTable.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupTable.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSearchSetti… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSearchSettings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgSearchSettings.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSearchSetti… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSearchSettings.h (original) +++ trunk/ncurses-pkg/src/NCPkgSearchSettings.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgSelMapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSelMapper.c… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSelMapper.cc (original) +++ trunk/ncurses-pkg/src/NCPkgSelMapper.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,49 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgSelMapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSelMapper.h… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSelMapper.h (original) +++ trunk/ncurses-pkg/src/NCPkgSelMapper.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStatusStrat… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStatusStrat… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStatusStrategy.h (original) +++ trunk/ncurses-pkg/src/NCPkgStatusStrategy.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.cc?… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgStrings.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.h?r… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.h (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.h?rev… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.h (original) +++ trunk/ncurses-pkg/src/NCPkgTable.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | Modified: trunk/ncurses-pkg/src/NCZypp.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCZypp.h?rev=672… ============================================================================== --- trunk/ncurses-pkg/src/NCZypp.h (original) +++ trunk/ncurses-pkg/src/NCZypp.h Tue Jan 17 13:42:49 2012 @@ -1,3 +1,26 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | -- 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] r67215 - /tags/stable-2_22_0/ncurses/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 12:14:35 2012 New Revision: 67215 URL: http://svn.opensuse.org/viewcvs/yast?rev=67215&view=rev Log: Created tag stable-2_22_0 for ncurses Added: tags/stable-2_22_0/ncurses/ - copied from r67214, trunk/ncurses/ -- 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] r67214 - /tags/stable-2_22_0/ncurses/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 12:14:05 2012 New Revision: 67214 URL: http://svn.opensuse.org/viewcvs/yast?rev=67214&view=rev Log: retag version Removed: tags/stable-2_22_0/ncurses/ -- 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] r67213 - /tags/stable-2_22_0/audit-laf/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 12:12:45 2012 New Revision: 67213 URL: http://svn.opensuse.org/viewcvs/yast?rev=67213&view=rev Log: Created tag stable-2_22_0 for audit-laf Added: tags/stable-2_22_0/audit-laf/ - copied from r67212, trunk/audit-laf/ -- 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] r67212 - /tags/stable-2_22_0/audit-laf/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 12:12:27 2012 New Revision: 67212 URL: http://svn.opensuse.org/viewcvs/yast?rev=67212&view=rev Log: retag version Removed: tags/stable-2_22_0/audit-laf/ -- 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] r67211 - /tags/stable-2_22_1/fcoe-client/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 12:10:31 2012 New Revision: 67211 URL: http://svn.opensuse.org/viewcvs/yast?rev=67211&view=rev Log: Created tag stable-2_22_1 for fcoe-client Added: tags/stable-2_22_1/fcoe-client/ - copied from r67210, trunk/fcoe-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67210 - /tags/stable-2_22_1/fcoe-client/
by gs＠svn2.opensuse.org 17 Jan '12

17 Jan '12

Author: gs Date: Tue Jan 17 12:10:20 2012 New Revision: 67210 URL: http://svn.opensuse.org/viewcvs/yast?rev=67210&view=rev Log: retag version Removed: tags/stable-2_22_1/fcoe-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67209 - in /trunk/ruby-bindings: package/yast2-ruby-bindings.changes yast2-ruby-bindings.spec.in
by coolo＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: coolo Date: Mon Jan 16 16:16:56 2012 New Revision: 67209 URL: http://svn.opensuse.org/viewcvs/yast?rev=67209&view=rev Log: confirm license Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes trunk/ruby-bindings/yast2-ruby-bindings.spec.in Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby… ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Mon Jan 16 16:16:56 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 16 15:16:39 UTC 2012 - coolo(a)suse.com + +- license should be GPL-2.0 without or later + +------------------------------------------------------------------- Mon Jan 16 14:47:57 UTC 2012 - jreidinger(a)suse.com - allows loading modules which follows rails ruby convention Modified: trunk/ruby-bindings/yast2-ruby-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/yast2-ruby-binding… ============================================================================== --- trunk/ruby-bindings/yast2-ruby-bindings.spec.in (original) +++ trunk/ruby-bindings/yast2-ruby-bindings.spec.in Mon Jan 16 16:16:56 2012 @@ -8,7 +8,7 @@ Name: yast2-ruby-bindings Version: @VERSION@ Release: 0 -License: GPL-2.0+ +License: GPL-2.0 Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 -- 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] r67208 - /tags/stable-2_22_3/snapper/
by jsuchome＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jsuchome Date: Mon Jan 16 16:10:04 2012 New Revision: 67208 URL: http://svn.opensuse.org/viewcvs/yast?rev=67208&view=rev Log: Created tag stable-2_22_3 for snapper Added: tags/stable-2_22_3/snapper/ - copied from r67207, trunk/snapper/ -- 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] r67207 - in /trunk/snapper: VERSION package/yast2-snapper.changes src/Snapper.ycp src/dialogs.ycp src/helps.ycp src/snapper.ycp src/wizards.ycp yast2-snapper.spec.in
by jsuchome＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jsuchome Date: Mon Jan 16 16:09:57 2012 New Revision: 67207 URL: http://svn.opensuse.org/viewcvs/yast?rev=67207&view=rev Log: - when reverting changes to selected snapshot, delete files as well (bnc#741214) - confirmed license - 2.22.3 Modified: trunk/snapper/VERSION trunk/snapper/package/yast2-snapper.changes trunk/snapper/src/Snapper.ycp trunk/snapper/src/dialogs.ycp trunk/snapper/src/helps.ycp trunk/snapper/src/snapper.ycp trunk/snapper/src/wizards.ycp trunk/snapper/yast2-snapper.spec.in Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=67207&r1=672… ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Mon Jan 16 16:09:57 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.ch… ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Mon Jan 16 16:09:57 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jan 16 15:06:11 CET 2012 - jsuchome(a)suse.cz + +- when reverting changes to selected snapshot, delete files as well + (bnc#741214) +- confirmed license +- 2.22.3 + +------------------------------------------------------------------- Thu Nov 24 11:49:50 CET 2011 - jsuchome(a)suse.cz - removed fixed sizes in UI, to prevent breaking Gtk (bnc#731363) Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=6720… ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Mon Jan 16 16:09:57 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under @@ -328,8 +328,10 @@ if (!FileUtils::Exists (orig)) { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf -- '%1'", String::Quote (full_path))); + y2milestone ("removing '%1' from system", full_path); // log entry (%1 is file name) - UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 does not exist in snapshot %2\n"), file, snapshot_num)); + UI::ChangeWidget (`id (`log), `LastLine, sformat (_("Deleted %1\n"), full_path)); } else if (FileUtils::CheckAndCreatePath (dir)) { Modified: trunk/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/dialogs.ycp?rev=6720… ============================================================================== --- trunk/snapper/src/dialogs.ycp (original) +++ trunk/snapper/src/dialogs.ycp Mon Jan 16 16:09:57 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under @@ -405,30 +405,27 @@ content = add (content, `VStretch ()); } + // button label + string restore_label = _("R&estore From First"); + // button label + string restore_label_single = _("Restore"); + + if (file_was_created (file)) + { + restore_label = Label::RemoveButton (); + restore_label_single= Label::RemoveButton (); + } + UI::ReplaceWidget (`id (`diff_content), `HBox (`HSpacing (0.5), `VBox ( content, `VSquash (`HBox ( `HStretch (), - // button label - type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), _("R&estore from First")), - // button label - `PushButton (`id (`restore), type == `SINGLE ? _("Restore") : _("Res&tore from Second")) + type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), restore_label), + `PushButton (`id (`restore), type == `SINGLE ? restore_label_single : _("Res&tore From Second")) )) ), `HSpacing (0.5)) ); - if (file_was_created (file)) - { - // file created after taking first snapshot cannot be restored from that snapshot - if (type == `SINGLE) - { - UI::ChangeWidget (`id (`restore), `Enabled, false); - } - else - { - UI::ChangeWidget (`id (`restore_pre), `Enabled, false); - } - } - else if (type != `SINGLE && file_was_removed (file)) + if (type != `SINGLE && file_was_removed (file)) { // file removed in 2nd snapshot cannot be restored from that snapshot UI::ChangeWidget (`id (`restore), `Enabled, false); @@ -629,13 +626,27 @@ else if (ret == `abort || ret == `cancel || ret == `back) { break; } + else if ((ret == `restore_pre || (ret == `restore && type == `SINGLE)) + && file_was_created (current_file)) + { + // yes/no question, %1 is file name, %2 is number + if (Popup::YesNo (sformat (_("Do you want to delete the file + +%1 + +from current system?"), Snapper::GetFileFullPath (current_file)))) + { + Snapper::RestoreFiles (ret == `restore_pre ? previous_num : snapshot_num, [current_file]); + } + continue; + } else if (ret == `restore_pre) { // yes/no question, %1 is file name, %2 is number - if (Popup::YesNo (sformat ("Do you want to copy the file + if (Popup::YesNo (sformat (_("Do you want to copy the file %1 -from snapshot '%2' to current system?", Snapper::GetFileFullPath (current_file), previous_num))) +from snapshot '%2' to current system?"), Snapper::GetFileFullPath (current_file), previous_num))) { Snapper::RestoreFiles (previous_num, [current_file]); } @@ -643,11 +654,11 @@ } else if (ret == `restore) { // yes/no question, %1 is file name, %2 is number - if (Popup::YesNo (sformat ("Do you want to copy the file + if (Popup::YesNo (sformat (_("Do you want to copy the file %1 -from snapshot '%2' to current system?", Snapper::GetFileFullPath (current_file), snapshot_num))) +from snapshot '%2' to current system?"), Snapper::GetFileFullPath (current_file), snapshot_num))) { Snapper::RestoreFiles (snapshot_num, [current_file]); } @@ -677,7 +688,12 @@ // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), // popup message, %1 is snapshot number, %2 list of files - sformat (_("These files will be copied from snapshot '%1' to current system: %2.Are you sure?"), + sformat (_("These files will be restored from snapshot '%1': + +%2 + +Files existing in original snapshot will be copied to current system. +Files that did not exist in the snapshot will be deleted.Are you sure?"), previous_num, mergestring (to_restore, " ")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { Modified: trunk/snapper/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/helps.ycp?rev=67207&… ============================================================================== --- trunk/snapper/src/helps.ycp (original) +++ trunk/snapper/src/helps.ycp Mon Jan 16 16:09:57 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under Modified: trunk/snapper/src/snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/snapper.ycp?rev=6720… ============================================================================== --- trunk/snapper/src/snapper.ycp (original) +++ trunk/snapper/src/snapper.ycp Mon Jan 16 16:09:57 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under Modified: trunk/snapper/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/wizards.ycp?rev=6720… ============================================================================== --- trunk/snapper/src/wizards.ycp (original) +++ trunk/snapper/src/wizards.ycp Mon Jan 16 16:09:57 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under Modified: trunk/snapper/yast2-snapper.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/yast2-snapper.spec.in?re… ============================================================================== --- trunk/snapper/yast2-snapper.spec.in (original) +++ trunk/snapper/yast2-snapper.spec.in Mon Jan 16 16:09:57 2012 @@ -2,7 +2,7 @@ @HEADER@ Requires: yast2 >= 2.21.22 -License: GPL-2.0+ +License: GPL-2.0 BuildRequires: update-desktop-files yast2 yast2-devtools yast2-testsuite libsnapper-devel BuildRequires: libtool doxygen yast2-core-devel gcc-c++ perl-XML-Writer -- 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] r67206 - /tags/branch-Code-11-SP2-2_17_13/snapper/
by jsuchome＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jsuchome Date: Mon Jan 16 16:09:55 2012 New Revision: 67206 URL: http://svn.opensuse.org/viewcvs/yast?rev=67206&view=rev Log: Created tag branch-Code-11-SP2-2_17_13 for snapper Added: tags/branch-Code-11-SP2-2_17_13/snapper/ - copied from r67205, branches/SuSE-Code-11-SP2-Branch/snapper/ -- 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] r67205 - in /branches/SuSE-Code-11-SP2-Branch/snapper: VERSION package/yast2-snapper.changes src/Snapper.ycp src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jsuchome Date: Mon Jan 16 16:09:44 2012 New Revision: 67205 URL: http://svn.opensuse.org/viewcvs/yast?rev=67205&view=rev Log: - when reverting changes to selected snapshot, delete files as well (bnc#741214) - 2.17.13 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/VERSION Mon Jan 16 16:09:44 2012 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Mon Jan 16 16:09:44 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 16 10:45:11 CET 2012 - jsuchome(a)suse.cz + +- when reverting changes to selected snapshot, delete files as well + (bnc#741214) +- 2.17.13 + +------------------------------------------------------------------- Thu Nov 24 11:52:29 CET 2011 - jsuchome(a)suse.cz - removed fixed sizes in UI, to prevent breaking Gtk (bnc#731363) Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Mon Jan 16 16:09:44 2012 @@ -328,8 +328,10 @@ if (!FileUtils::Exists (orig)) { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf -- '%1'", String::Quote (full_path))); + y2milestone ("removing '%1' from system", full_path); // log entry (%1 is file name) - UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 does not exist in snapshot %2\n"), file, snapshot_num)); + UI::ChangeWidget (`id (`log), `LastLine, sformat (_("Deleted %1\n"), full_path)); } else if (FileUtils::CheckAndCreatePath (dir)) { Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp Mon Jan 16 16:09:44 2012 @@ -405,30 +405,27 @@ content = add (content, `VStretch ()); } + // button label + string restore_label = _("R&estore From First"); + // button label + string restore_label_single = _("Restore"); + + if (file_was_created (file)) + { + restore_label = Label::RemoveButton (); + restore_label_single= Label::RemoveButton (); + } + UI::ReplaceWidget (`id (`diff_content), `HBox (`HSpacing (0.5), `VBox ( content, `VSquash (`HBox ( `HStretch (), - // button label - type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), _("R&estore From First")), - // button label - `PushButton (`id (`restore), type == `SINGLE ? _("Restore") : _("Res&tore From Second")) + type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), restore_label), + `PushButton (`id (`restore), type == `SINGLE ? restore_label_single : _("Res&tore From Second")) )) ), `HSpacing (0.5)) ); - if (file_was_created (file)) - { - // file created after taking first snapshot cannot be restored from that snapshot - if (type == `SINGLE) - { - UI::ChangeWidget (`id (`restore), `Enabled, false); - } - else - { - UI::ChangeWidget (`id (`restore_pre), `Enabled, false); - } - } - else if (type != `SINGLE && file_was_removed (file)) + if (type != `SINGLE && file_was_removed (file)) { // file removed in 2nd snapshot cannot be restored from that snapshot UI::ChangeWidget (`id (`restore), `Enabled, false); @@ -629,13 +626,27 @@ else if (ret == `abort || ret == `cancel || ret == `back) { break; } + else if ((ret == `restore_pre || (ret == `restore && type == `SINGLE)) + && file_was_created (current_file)) + { + // yes/no question, %1 is file name, %2 is number + if (Popup::YesNo (sformat (_("Do you want to delete the file + +%1 + +from current system?"), Snapper::GetFileFullPath (current_file)))) + { + Snapper::RestoreFiles (ret == `restore_pre ? previous_num : snapshot_num, [current_file]); + } + continue; + } else if (ret == `restore_pre) { // yes/no question, %1 is file name, %2 is number - if (Popup::YesNo (sformat ("Do you want to copy the file + if (Popup::YesNo (sformat (_("Do you want to copy the file %1 -from snapshot '%2' to current system?", Snapper::GetFileFullPath (current_file), previous_num))) +from snapshot '%2' to current system?"), Snapper::GetFileFullPath (current_file), previous_num))) { Snapper::RestoreFiles (previous_num, [current_file]); } @@ -643,11 +654,11 @@ } else if (ret == `restore) { // yes/no question, %1 is file name, %2 is number - if (Popup::YesNo (sformat ("Do you want to copy the file + if (Popup::YesNo (sformat (_("Do you want to copy the file %1 -from snapshot '%2' to current system?", Snapper::GetFileFullPath (current_file), snapshot_num))) +from snapshot '%2' to current system?"), Snapper::GetFileFullPath (current_file), snapshot_num))) { Snapper::RestoreFiles (snapshot_num, [current_file]); } @@ -677,7 +688,12 @@ // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), // popup message, %1 is snapshot number, %2 list of files - sformat (_("These files will be copied from snapshot '%1' to current system: %2Are you sure?"), + sformat (_("These files will be restored from snapshot '%1': + +%2 + +Files existing in original snapshot will be copied to current system. +Files that did not exist in the snapshot will be deleted.Are you sure?"), previous_num, mergestring (to_restore, " ")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { -- 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] r67204 - in /trunk/vm: package/yast2-vm.changes yast2-vm.spec.in
by coolo＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: coolo Date: Mon Jan 16 15:57:37 2012 New Revision: 67204 URL: http://svn.opensuse.org/viewcvs/yast?rev=67204&view=rev Log: confirm license Modified: trunk/vm/package/yast2-vm.changes trunk/vm/yast2-vm.spec.in Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Mon Jan 16 15:57:37 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 16 14:54:33 UTC 2012 - coolo(a)suse.com + +- confirm license + +------------------------------------------------------------------- Tue Jan 3 10:53:10 MST 2012 - carnold(a)novell.com - bnc#733715 - SLES11_SP2_LOC : EN: Typo in relocation-server.pot - Modified: trunk/vm/yast2-vm.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/yast2-vm.spec.in?rev=67204&r1… ============================================================================== --- trunk/vm/yast2-vm.spec.in (original) +++ trunk/vm/yast2-vm.spec.in Mon Jan 16 15:57:37 2012 @@ -4,6 +4,7 @@ @HEADER@ ExclusiveArch: %ix86 x86_64 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +License: GPL-2.0 Requires: yast2 >= 2.21.22 Summary: Configure Hypervisor and Tools for Xen and KVM -- 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] r67203 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/lilolike.ycp
by snwint＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: snwint Date: Mon Jan 16 15:50:17 2012 New Revision: 67203 URL: http://svn.opensuse.org/viewcvs/yast?rev=67203&view=rev Log: - really update bootloader sections after device renaming (bnc #727310) - 2.17.85 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Mon Jan 16 15:50:17 2012 @@ -1 +1 @@ -2.17.84 +2.17.85 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Jan 16 15:50:17 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 13 15:48:55 CET 2012 - snwint(a)suse.de + +- really update bootloader sections after device renaming (bnc #727310) +- 2.17.85 + +------------------------------------------------------------------- Tue Dec 6 15:49:53 CET 2011 - snwint(a)suse.de - use elilo to handle efi boot menu entries (bnc #717828) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Mon Jan 16 15:50:17 2012 @@ -755,7 +755,7 @@ * Update in section old devices to new kernel format * @param section section to modify */ -void UpdateDeviceForSection(map<string,any> section){ +map<string,any> UpdateDeviceForSection(map<string,any> section) { if (section["type"]:"" == "image" || section["type"]:"" == "xen") { //check if we update correct image and if update is needed @@ -778,6 +778,8 @@ section["__modified"] = "1"; } } + + return section; } /** bnc#474039 upgrade from sles10sp2 to sles11 xen has incorrect default boot option @@ -790,9 +792,9 @@ */ global void UpdateSections () { - foreach (map<string,any> section, BootCommon::sections,{ + BootCommon::sections = maplist(map<string,any> section, BootCommon::sections, { //remap device names from hd* to sd* - UpdateDeviceForSection(section); + return UpdateDeviceForSection(section); }); } -- 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] r67202 - /trunk/ruby-bindings/package/yast2-ruby-bindings.changes
by jreidinger＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jreidinger Date: Mon Jan 16 15:50:08 2012 New Revision: 67202 URL: http://svn.opensuse.org/viewcvs/yast?rev=67202&view=rev Log: changes Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby… ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Mon Jan 16 15:50:08 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 16 14:47:57 UTC 2012 - jreidinger(a)suse.com + +- allows loading modules which follows rails ruby convention + ( ActiveSupport module is in active_support.rb file ) + (bnc#705417) + +------------------------------------------------------------------- Wed Dec 7 10:06:27 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format -- 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] r67201 - in /trunk/ruby-bindings: src/ruby/Y2CCRuby.cc src/ruby/Y2RubyComponent.cc src/ruby/Y2RubyComponent.h tests/ycp/camel_case.rb tests/ycp/ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jreidinger Date: Mon Jan 16 15:47:37 2012 New Revision: 67201 URL: http://svn.opensuse.org/viewcvs/yast?rev=67201&view=rev Log: fix loading of ruby module when module follows ruby convention ( so ActiveSupport module in in active_support.rb ) Added: trunk/ruby-bindings/tests/ycp/camel_case.rb Modified: trunk/ruby-bindings/src/ruby/Y2CCRuby.cc trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc trunk/ruby-bindings/src/ruby/Y2RubyComponent.h trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/src/ruby/Y2CCRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2CCRuby.… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2CCRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2CCRuby.cc Mon Jan 16 15:47:37 2012 @@ -46,6 +46,11 @@ // is there a ruby module? // must be the same in Y2CCRuby and Y2RubyComponent string module = YCPPathSearch::find (YCPPathSearch::Module, string (name) + ".rb"); + //lets try convert it with rails coding convention + if (module.empty()) + { + module = YCPPathSearch::find (YCPPathSearch::Module, Y2RubyComponent::CamelCase2DelimSepated(name) + ".rb"); + } if (!module.empty ()) { Modified: trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyCom… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc Mon Jan 16 15:47:37 2012 @@ -57,8 +57,12 @@ string module = YCPPathSearch::find (YCPPathSearch::Module, string (name) + ".rb"); if (module.empty ()) { - y2internal ("Couldn't find %s after Y2CCRuby pointed to us", name); - return NULL; + module = YCPPathSearch::find (YCPPathSearch::Module, Y2RubyComponent::CamelCase2DelimSepated(name) + ".rb"); + if (module.empty ()) + { + y2internal ("Couldn't find %s after Y2CCRuby pointed to us", name); + return NULL; + } } y2milestone("Found in '%s'", module.c_str()); module.erase (module.size () - 3 /* strlen (".pm") */); @@ -73,3 +77,22 @@ return ns; } + +const string Y2RubyComponent::CamelCase2DelimSepated( const char* name) +{ + string res(name); + size_t size = res.size(); + if (size==0) + return res; + res[0] = tolower(res[0]); //first character breaks rule with replace upper with _lower + for (size_t i = 1; i< res.size();i++) + { + if (isupper(res[i])) + { + string tmp = "_"; + tmp.push_back (tolower(res[i])); + res.replace(i,1,tmp); //replace upper by _lower + } + } + return res; +} Modified: trunk/ruby-bindings/src/ruby/Y2RubyComponent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyCom… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyComponent.h (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyComponent.h Mon Jan 16 15:47:37 2012 @@ -23,6 +23,7 @@ #define Y2RubyComponent_h #include "Y2.h" +#include <string.h> /** @@ -71,6 +72,13 @@ * free it. Thus, it's possible to share the instance. */ Y2Namespace *import (const char* name); + + /** + * Utility method to translate camelcase name of module to delimeter + * separated one. It is useful for loading modules which follows conventions + * so ActiveSupport namespace is from active_support.rb. + */ + static const std::string CamelCase2DelimSepated (const char* name); }; #endif // Y2RubyComponent_h Added: trunk/ruby-bindings/tests/ycp/camel_case.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/camel_ca… ============================================================================== --- trunk/ruby-bindings/tests/ycp/camel_case.rb (added) +++ trunk/ruby-bindings/tests/ycp/camel_case.rb Mon Jan 16 15:47:37 2012 @@ -0,0 +1,5 @@ +module CamelCase + def self.inc (n) + n+1 + end +end Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Mon Jan 16 15:47:37 2012 @@ -3,4 +3,7 @@ import "InRuby"; string result = tostring(InRuby::multiply_by_eight(10)); y2milestone("result: %1", result); + import "CamelCase"; + result = tostring(CamelCase::inc(10)); + y2milestone("result: %1", result); } -- 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] r67200 - in /trunk/network: ./ package/yast2-network.changes src/lan/address.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 16:05:54 2012 New Revision: 67200 URL: http://svn.opensuse.org/viewcvs/yast?rev=67200&view=rev Log: Fixed the bonding label again following info from mt (bnc#737333#c18). svn merge -c67199 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/network Modified: trunk/network/ (props changed) trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp 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 Fri Jan 13 16:05:54 2012 @@ -3,7 +3,7 @@ - AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). -- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or +- Clarified the label for BOOTPROTO=none: "No Link and IP Setup ( Bonding Slaves)" (bnc#737333). - 2.22.1 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 Fri Jan 13 16:05:54 2012 @@ -323,7 +323,7 @@ else */ if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -781,7 +781,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) -- 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] r67199 - in /branches/SuSE-Code-11-SP2-Branch/network: package/yast2-network.changes src/lan/address.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 16:03:53 2012 New Revision: 67199 URL: http://svn.opensuse.org/viewcvs/yast?rev=67199&view=rev Log: Fixed the bonding label again following info from mt (bnc#737333#c18). Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Jan 13 16:03:53 2012 @@ -3,7 +3,7 @@ - AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). -- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or +- Clarified the label for BOOTPROTO=none: "No Link and IP Setup ( Bonding Slaves)" (bnc#737333). - 2.17.166 Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Fri Jan 13 16:03:53 2012 @@ -225,7 +225,7 @@ void initBootProto (string key) { if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); else if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -680,7 +680,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) -- 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] r67198 - /tags/branch-Linux-12_1-2_21_4/backup/
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:56:57 2012 New Revision: 67198 URL: http://svn.opensuse.org/viewcvs/yast?rev=67198&view=rev Log: Created tag branch-Linux-12_1-2_21_4 for backup Added: tags/branch-Linux-12_1-2_21_4/backup/ - copied from r67197, branches/SuSE-Linux-12_1-Branch/backup/ -- 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] r67197 - /tags/branch-Linux-12_1-2_21_4/
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:56:54 2012 New Revision: 67197 URL: http://svn.opensuse.org/viewcvs/yast?rev=67197&view=rev Log: Created tag branch-Linux-12_1-2_21_4 Added: tags/branch-Linux-12_1-2_21_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] r67196 - /tags/stable-2_22_0/backup/
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:56:43 2012 New Revision: 67196 URL: http://svn.opensuse.org/viewcvs/yast?rev=67196&view=rev Log: Created tag stable-2_22_0 for backup Added: tags/stable-2_22_0/backup/ - copied from r67195, trunk/backup/ -- 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] r67195 - in /trunk/backup: VERSION package/yast2-backup.changes src/scripts/backup_search.pl
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:55:44 2012 New Revision: 67195 URL: http://svn.opensuse.org/viewcvs/yast?rev=67195&view=rev Log: - Fixed parsing output from verification of packages (bnc #736233) - 2.22.0 Modified: trunk/backup/VERSION trunk/backup/package/yast2-backup.changes trunk/backup/src/scripts/backup_search.pl Modified: trunk/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/VERSION?rev=67195&r1=6719… ============================================================================== --- trunk/backup/VERSION (original) +++ trunk/backup/VERSION Fri Jan 13 15:55:44 2012 @@ -1 +1 @@ -2.21.3 +2.22.0 Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Fri Jan 13 15:55:44 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 13 15:53:45 CET 2012 - locilka(a)suse.cz + +- Fixed parsing output from verification of packages (bnc #736233) +- 2.22.0 + +------------------------------------------------------------------- Fri Oct 14 12:22:11 CEST 2011 - locilka(a)suse.cz - Using UI::AskForSaveFileName for selecting new/existent file Modified: trunk/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/scripts/backup_search… ============================================================================== --- trunk/backup/src/scripts/backup_search.pl (original) +++ trunk/backup/src/scripts/backup_search.pl Fri Jan 13 15:55:44 2012 @@ -25,9 +25,9 @@ #function prototypes sub ReadAllPackages(); sub FsToDirs(@); -sub ReadAllFiles(%%); -sub VerifyPackages(@%%); -sub SearchDirectory($%%%); +sub ReadAllFiles; +sub VerifyPackages; +sub SearchDirectory; # command line options my $search_files = 0; @@ -453,6 +453,21 @@ } } +sub split_rpm_verify ($) { + # format of the line: + # _9_chars_with_changed_attrs_ _1_char_file_type_ /changed/file/name + # + # example: + # 5S.T..... c /etc/ssh/sshd_config + my $verify_output_line = shift; + + my $rpmout = substr($verify_output_line, 0, 9); + my $filename = $verify_output_line; + $filename =~ s/^.{9}[^\/]+//; + + return ($rpmout, $filename); +} + # Check file and return whether to backup or not sub CheckFile { my $line = shift; @@ -470,25 +485,26 @@ my $backup = 1; my $file_size = 0; - $link = ($$line =~ /^....L.* (\/.*)/); + my ($verify_out, $filename) = split_rpm_verify ($$line); + $link = ($verify_out =~ /L/); if ($link) { - $file = $1; + $file = $filename; } if ($no_md5) { - $size = ($$line =~ /^S.* (\/.*)/); + $size = ($verify_out =~ /S/); if ($size) { - $file = $1; + $file = $filename; } - $mtime = ($$line =~ /^\..{6}T.* (\/.*)/); + $mtime = ($verify_out =~ /T/); if ($mtime) { - $file = $1; + $file = $filename; } @@ -529,7 +545,8 @@ { while (my $fl = <RPMVRF>) { - if (($fl !~ /^S.* \/./) and ($fl !~ /^\..{6}T.* \/.*/) and ($fl !~ /^..5.* \/.*/)) + my ($vo, $fn) = split_rpm_verify ($fl); + if (($vo !~ /S/) and ($vo !~ /T/) and ($vo !~ /5/)) { $backup = 0; } @@ -545,10 +562,11 @@ } else { - $md5_test = ($$line =~ /^..5.* (\/.*)/); + my ($rpmout, $filename) = split_rpm_verify($$line); + $md5_test = ($rpmout =~ /5/); if ($md5_test) { - $file = $1; + $file = $filename; } } @@ -563,7 +581,7 @@ } # verify each package in the list -sub VerifyPackages(@%%) { +sub VerifyPackages() { my ($packages, $unavail, $duplicates) = @_; # rpm -q --filesbypkg @all-rpm-packages @@ -635,7 +653,7 @@ # read all files which belong to packages -sub ReadAllFiles(%%) +sub ReadAllFiles() { my ($all_files, $pkg_inodes) = @_; my %duplicates; @@ -731,7 +749,7 @@ } # search files which do not belong to any package -sub SearchDirectory($%%%) +sub SearchDirectory() { my ($dir, $files, $exclude, $inodes) = @_; -- 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] r67194 - in /branches/SuSE-Linux-12_1-Branch/backup: VERSION package/yast2-backup.changes src/scripts/backup_search.pl
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:55:24 2012 New Revision: 67194 URL: http://svn.opensuse.org/viewcvs/yast?rev=67194&view=rev Log: - Fixed parsing output from verification of packages (bnc #736233) - 2.21.4 Modified: branches/SuSE-Linux-12_1-Branch/backup/VERSION branches/SuSE-Linux-12_1-Branch/backup/package/yast2-backup.changes branches/SuSE-Linux-12_1-Branch/backup/src/scripts/backup_search.pl Modified: branches/SuSE-Linux-12_1-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/backup… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/backup/VERSION (original) +++ branches/SuSE-Linux-12_1-Branch/backup/VERSION Fri Jan 13 15:55:24 2012 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: branches/SuSE-Linux-12_1-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/backup… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Linux-12_1-Branch/backup/package/yast2-backup.changes Fri Jan 13 15:55:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 13 15:53:45 CET 2012 - locilka(a)suse.cz + +- Fixed parsing output from verification of packages (bnc #736233) +- 2.21.4 + +------------------------------------------------------------------- Fri Oct 14 12:22:11 CEST 2011 - locilka(a)suse.cz - Using UI::AskForSaveFileName for selecting new/existent file Modified: branches/SuSE-Linux-12_1-Branch/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/backup… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/backup/src/scripts/backup_search.pl (original) +++ branches/SuSE-Linux-12_1-Branch/backup/src/scripts/backup_search.pl Fri Jan 13 15:55:24 2012 @@ -25,9 +25,9 @@ #function prototypes sub ReadAllPackages(); sub FsToDirs(@); -sub ReadAllFiles(%%); -sub VerifyPackages(@%%); -sub SearchDirectory($%%%); +sub ReadAllFiles; +sub VerifyPackages; +sub SearchDirectory; # command line options my $search_files = 0; @@ -453,6 +453,21 @@ } } +sub split_rpm_verify ($) { + # format of the line: + # _9_chars_with_changed_attrs_ _1_char_file_type_ /changed/file/name + # + # example: + # 5S.T..... c /etc/ssh/sshd_config + my $verify_output_line = shift; + + my $rpmout = substr($verify_output_line, 0, 9); + my $filename = $verify_output_line; + $filename =~ s/^.{9}[^\/]+//; + + return ($rpmout, $filename); +} + # Check file and return whether to backup or not sub CheckFile { my $line = shift; @@ -470,25 +485,26 @@ my $backup = 1; my $file_size = 0; - $link = ($$line =~ /^....L.* (\/.*)/); + my ($verify_out, $filename) = split_rpm_verify ($$line); + $link = ($verify_out =~ /L/); if ($link) { - $file = $1; + $file = $filename; } if ($no_md5) { - $size = ($$line =~ /^S.* (\/.*)/); + $size = ($verify_out =~ /S/); if ($size) { - $file = $1; + $file = $filename; } - $mtime = ($$line =~ /^\..{6}T.* (\/.*)/); + $mtime = ($verify_out =~ /T/); if ($mtime) { - $file = $1; + $file = $filename; } @@ -529,7 +545,8 @@ { while (my $fl = <RPMVRF>) { - if (($fl !~ /^S.* \/./) and ($fl !~ /^\..{6}T.* \/.*/) and ($fl !~ /^..5.* \/.*/)) + my ($vo, $fn) = split_rpm_verify ($fl); + if (($vo !~ /S/) and ($vo !~ /T/) and ($vo !~ /5/)) { $backup = 0; } @@ -545,10 +562,11 @@ } else { - $md5_test = ($$line =~ /^..5.* (\/.*)/); + my ($rpmout, $filename) = split_rpm_verify($$line); + $md5_test = ($rpmout =~ /5/); if ($md5_test) { - $file = $1; + $file = $filename; } } @@ -563,7 +581,7 @@ } # verify each package in the list -sub VerifyPackages(@%%) { +sub VerifyPackages() { my ($packages, $unavail, $duplicates) = @_; # rpm -q --filesbypkg @all-rpm-packages @@ -635,7 +653,7 @@ # read all files which belong to packages -sub ReadAllFiles(%%) +sub ReadAllFiles() { my ($all_files, $pkg_inodes) = @_; my %duplicates; @@ -731,7 +749,7 @@ } # search files which do not belong to any package -sub SearchDirectory($%%%) +sub SearchDirectory() { my ($dir, $files, $exclude, $inodes) = @_; -- 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] r67193 - in /trunk/network: ./ VERSION package/yast2-network.changes src/clients/lan_auto.ycp src/lan/address.ycp src/lan/hardware.ycp src/modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 15:54:33 2012 New Revision: 67193 URL: http://svn.opensuse.org/viewcvs/yast?rev=67193&view=rev Log: - AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). - Clarified the label for BOOTPROTO=none: "No Setup (Bridge or Bonding Slaves)" (bnc#737333). svn merge -r67186:67192 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/network Modified: trunk/network/ (props changed) trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/lan/address.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67193&r1=671… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jan 13 15:54:33 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 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 Fri Jan 13 15:54:33 2012 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Jan 12 15:52:47 CET 2012 - mvidner(a)suse.cz + +- AY keep_install_network: merge dns and routing from linuxrc + item by item, not just in bulk (bnc#712864). +- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or + Bonding Slaves)" (bnc#737333). +- 2.22.1 + +------------------------------------------------------------------- Fri Jan 6 16:17:00 CET 2012 - mvidner(a)suse.cz - skip USB NICs during bridge proposal (bnc#710098) Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp… ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Fri Jan 13 15:54:33 2012 @@ -70,27 +70,29 @@ */ define map FromAY(map input) { - y2debug("input %1", input); + y2debug("input %1", input); - list<map<string,any> > ifaces=[]; - foreach(map<string,any> interface, input["interfaces"]:[], { - map<string,any> iface=$[]; - foreach(string key, any value, interface, { - if (key == "aliases"){ - foreach(string k, map<string,any > v, (map<string, map<string,any> >)value, { - // replace "alias0" to "0" (bnc#372687) - map<string,any> t = (map<string,any>)value; - t[v["LABEL"]:""]=t[k]:$[]; - t=remove(t,k); - value=t; - }); - } else - if (key=="device") value = LanUdevAuto::getDeviceName(tostring(value)); - iface[key]=value; - }); - ifaces = add(ifaces, iface); - }); - input["interfaces"] = ifaces; + list<map<string,any> > ifaces=[]; + foreach(map<string,any> interface, input["interfaces"]:[], { + map<string,any> iface=$[]; + foreach(string key, any value, interface, { + if (key == "aliases"){ + foreach(string k, map<string,any > v, (map<string, map<string,any> >)value, { + // replace "alias0" to "0" (bnc#372687) + map<string,any> t = (map<string,any>)value; + t[v["LABEL"]:""]=t[k]:$[]; + t=remove(t,k); + value=t; + }); + } + else if (key=="device") { + value = LanUdevAuto::getDeviceName(tostring(value)); + } + iface[key]=value; + }); + ifaces = add(ifaces, iface); + }); + input["interfaces"] = ifaces; map<string,map> interfaces = listmap(map<string, any> interface, (list<map<string, any> >)input["interfaces"]:[], @@ -286,29 +288,34 @@ ret = LanAutoSequence(""); } else if(func == "Import") { - // see bnc#498993 - // in case keep_install_network is set to true (in AY) - // and there is no dns and routing definition, - // we'll keep values from installation - if(param["keep_install_network"]:false==true) { - y2milestone("keep_install_network is enabled"); - if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){ - y2milestone("DNS and routing are not defined in AY, will keep settings from installation"); - // read settings from installation - Lan::Read(`cache); - // export settings into AY map - map from_system=Lan::Export(); - map dns=from_system["dns"]:$[]; - map routing=from_system["routing"]:$[]; - // merge with param - param["dns"]=dns; - param["routing"]=routing; - y2milestone("dns %1", dns); - y2milestone("routing %1", routing); - } else{ - y2milestone("DNS and routing defined in AY profile, will use it"); - } - } + // see bnc#498993 + // in case keep_install_network is set to true (in AY) + // we'll keep values from installation + // and merge with XML data (bnc#712864) + if(param["keep_install_network"]:false==true) { + // read settings from installation + Lan::Read(`cache); + // export settings into AY map + map from_system=Lan::Export(); + map dns = from_system["dns"]:$[]; + map routing = from_system["routing"]:$[]; + + // copy the keys/values that are not existing in the XML + // so we merge the inst-sys settings with the XML while XML + // has higher priority + foreach( string key, any value, dns, { + if( ! haskey( param["dns"]:$[], key ) ) { + y2milestone("(dns) taking %1 from inst-sys. Value = %2", key, value); + param["dns",key] = value; + } + }); + foreach( string key, any value, routing, { + if( ! haskey( param["routing"]:$[], key ) ) { + param["routing",key] = value; + y2milestone("(routing) taking %1 from inst-sys. Value = %2", key, value); + } + }); + } map new = FromAY(param); Lan::Import(new); ret = true; 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 Fri Jan 13 15:54:33 2012 @@ -323,7 +323,7 @@ else */ if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -781,7 +781,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")), + `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) 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 Fri Jan 13 15:54:33 2012 @@ -594,7 +594,6 @@ /* TextEntry label */ `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), `VSpacing(1), -// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"), LanItems::qeth_chanids) `HBox( `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:""), @@ -612,29 +611,6 @@ _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); } -/* - if(LanItems::type == "hsi") { - contents = `HBox( - `HSpacing(6), - `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( - `VSpacing(1), - `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), - `VSpacing(1), - `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), - `VSpacing(1), - `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), - `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), - `VSpacing(1) - ), `HSpacing(2))), - `HSpacing(6) - ); - helptext = _("Enter any additional Options for this interface (separated by spaces).") + - _("Select Enable IPA Takeover if IP address takeover should be enabled for this interface.") + - _("Select Enable Layer 2 Support if this card has been configured with layer 2 support.") + - _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); - } -*/ - if(drvtype == "lcs") { list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); map<string, any> chanids_map = $[ @@ -767,8 +743,7 @@ LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } -// if (LanItems::type != "hsi") - LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); + LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); if(LanItems::type == "lcs") LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Jan 13 15:54:33 2012 @@ -975,8 +975,6 @@ global define boolean Select(string dev) { y2debug("dev=%1", dev); map devmap = $[]; - /* dev=="" -> Add */ -// if(dev == "") { // defaults for a new device devmap = $[ // for hotplug devices set STARTMODE=hotplug (#132583) @@ -1009,27 +1007,24 @@ type = Items[current, "hwinfo", "type"]:"eth"; device = NetworkInterfaces::GetFreeDevice(type); - // TODO: instead of udev use hwinfo dev_name NetworkInterfaces::Name = GetItemUdev("NAME"); if (size(Items)<current) Items[current] = $["ifcfg":NetworkInterfaces::Name]; else Items[current, "ifcfg"] = NetworkInterfaces::Name; - /* FIXME: alias: how to prefill new alias? */ alias = ""; + /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); hotplug = ""; - y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; @@ -1408,9 +1403,7 @@ SetDeviceVars(devmap, SysconfigDefaults); - hotplug = ""; - y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); -- 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] r67192 - in /branches/SuSE-Code-11-SP2-Branch/network: package/yast2-network.changes src/clients/lan_auto.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 15:39:21 2012 New Revision: 67192 URL: http://svn.opensuse.org/viewcvs/yast?rev=67192&view=rev Log: AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Jan 13 15:39:21 2012 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Thu Jan 12 15:52:47 CET 2012 - mvidner(a)suse.cz +- AY keep_install_network: merge dns and routing from linuxrc + item by item, not just in bulk (bnc#712864). - Clarified the label for BOOTPROTO=none: "No Setup (Bridge or Bonding Slaves)" (bnc#737333). - 2.17.166 Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Fri Jan 13 15:39:21 2012 @@ -288,26 +288,31 @@ else if(func == "Import") { // see bnc#498993 // in case keep_install_network is set to true (in AY) - // and there is no dns and routing definition, // we'll keep values from installation + // and merge with XML data (bnc#712864) if(param["keep_install_network"]:false==true) { - y2milestone("keep_install_network is enabled"); - if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){ - y2milestone("DNS and routing are not defined in AY, will keep settings from installation"); - // read settings from installation - Lan::Read(`cache); - // export settings into AY map - map from_system=Lan::Export(); - map dns=from_system["dns"]:$[]; - map routing=from_system["routing"]:$[]; - // merge with param - param["dns"]=dns; - param["routing"]=routing; - y2milestone("dns %1", dns); - y2milestone("routing %1", routing); - } else{ - y2milestone("DNS and routing defined in AY profile, will use it"); - } + // read settings from installation + Lan::Read(`cache); + // export settings into AY map + map from_system=Lan::Export(); + map dns = from_system["dns"]:$[]; + map routing = from_system["routing"]:$[]; + + // copy the keys/values that are not existing in the XML + // so we merge the inst-sys settings with the XML while XML + // has higher priority + foreach( string key, any value, dns, { + if( ! haskey( param["dns"]:$[], key ) ) { + y2milestone("(dns) taking %1 from inst-sys. Value = %2", key, value); + param["dns",key] = value; + } + }); + foreach( string key, any value, routing, { + if( ! haskey( param["routing"]:$[], key ) ) { + param["routing",key] = value; + y2milestone("(routing) taking %1 from inst-sys. Value = %2", key, value); + } + }); } map new = FromAY(param); Lan::Import(new); -- 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] r67191 - /branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 15:39:18 2012 New Revision: 67191 URL: http://svn.opensuse.org/viewcvs/yast?rev=67191&view=rev Log: Reindented Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Fri Jan 13 15:39:18 2012 @@ -70,27 +70,29 @@ */ define map FromAY(map input) { - y2debug("input %1", input); + y2debug("input %1", input); - list<map<string,any> > ifaces=[]; - foreach(map<string,any> interface, input["interfaces"]:[], { - map<string,any> iface=$[]; - foreach(string key, any value, interface, { - if (key == "aliases"){ - foreach(string k, map<string,any > v, (map<string, map<string,any> >)value, { - // replace "alias0" to "0" (bnc#372687) - map<string,any> t = (map<string,any>)value; - t[v["LABEL"]:""]=t[k]:$[]; - t=remove(t,k); - value=t; - }); - } else - if (key=="device") value = LanUdevAuto::getDeviceName(tostring(value)); - iface[key]=value; - }); - ifaces = add(ifaces, iface); - }); - input["interfaces"] = ifaces; + list<map<string,any> > ifaces=[]; + foreach(map<string,any> interface, input["interfaces"]:[], { + map<string,any> iface=$[]; + foreach(string key, any value, interface, { + if (key == "aliases"){ + foreach(string k, map<string,any > v, (map<string, map<string,any> >)value, { + // replace "alias0" to "0" (bnc#372687) + map<string,any> t = (map<string,any>)value; + t[v["LABEL"]:""]=t[k]:$[]; + t=remove(t,k); + value=t; + }); + } + else if (key=="device") { + value = LanUdevAuto::getDeviceName(tostring(value)); + } + iface[key]=value; + }); + ifaces = add(ifaces, iface); + }); + input["interfaces"] = ifaces; map<string,map> interfaces = listmap(map<string, any> interface, (list<map<string, any> >)input["interfaces"]:[], @@ -284,29 +286,29 @@ ret = LanAutoSequence(""); } else if(func == "Import") { - // see bnc#498993 - // in case keep_install_network is set to true (in AY) - // and there is no dns and routing definition, - // we'll keep values from installation - if(param["keep_install_network"]:false==true) { - y2milestone("keep_install_network is enabled"); - if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){ - y2milestone("DNS and routing are not defined in AY, will keep settings from installation"); - // read settings from installation - Lan::Read(`cache); - // export settings into AY map - map from_system=Lan::Export(); - map dns=from_system["dns"]:$[]; - map routing=from_system["routing"]:$[]; - // merge with param - param["dns"]=dns; - param["routing"]=routing; - y2milestone("dns %1", dns); - y2milestone("routing %1", routing); - } else{ - y2milestone("DNS and routing defined in AY profile, will use it"); - } - } + // see bnc#498993 + // in case keep_install_network is set to true (in AY) + // and there is no dns and routing definition, + // we'll keep values from installation + if(param["keep_install_network"]:false==true) { + y2milestone("keep_install_network is enabled"); + if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){ + y2milestone("DNS and routing are not defined in AY, will keep settings from installation"); + // read settings from installation + Lan::Read(`cache); + // export settings into AY map + map from_system=Lan::Export(); + map dns=from_system["dns"]:$[]; + map routing=from_system["routing"]:$[]; + // merge with param + param["dns"]=dns; + param["routing"]=routing; + y2milestone("dns %1", dns); + y2milestone("routing %1", routing); + } else{ + y2milestone("DNS and routing defined in AY profile, will use it"); + } + } map new = FromAY(param); Lan::Import(new); ret = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67190 - in /trunk/yast2: ./ VERSION library/network/src/Internet.ycp package/yast2.changes
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 14:46:05 2012 New Revision: 67190 URL: http://svn.opensuse.org/viewcvs/yast?rev=67190&view=rev Log: Internet test: fail early if NetworkManager has crashed (bnc#739390) svn merge -c67189 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/yast2 Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/network/src/Internet.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67190&r1=67189… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jan 13 14:46:05 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/yast2/library/network/src/Internet.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Intern… ============================================================================== --- trunk/yast2/library/network/src/Internet.ycp (original) +++ trunk/yast2/library/network/src/Internet.ycp Fri Jan 13 14:46:05 2012 @@ -167,7 +167,8 @@ // Skip test in case of NM because it returns code 3 (interface under NM controll) if(NetworkService::IsManaged ()){ y2milestone("Skipping interface status test because of NetworkManager"); - return true; + // only check if NM has not crashed + return SCR::Execute(.target.bash, "pgrep NetworkManager") == 0; } integer ret = (integer) SCR::Execute(.target.bash, "/sbin/ifstatus " + device); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jan 13 14:46:05 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 13 14:35:47 CET 2012 - mvidner(a)suse.cz + +- Internet test: fail early if NetworkManager has crashed + (bnc#739390). +- 2.22.3 + +------------------------------------------------------------------- Fri Jan 6 15:06:00 CET 2012 - mvidner(a)suse.cz - Relicensed ConfigHistory from GPL-2.0 to GPL-2.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] r67189 - in /branches/SuSE-Code-11-SP2-Branch/yast2: VERSION library/network/src/Internet.ycp package/yast2.changes
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 14:38:23 2012 New Revision: 67189 URL: http://svn.opensuse.org/viewcvs/yast?rev=67189&view=rev Log: Internet test: fail early if NetworkManager has crashed (bnc#739390). Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/Internet.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Fri Jan 13 14:38:23 2012 @@ -1 +1 @@ -2.17.118 +2.17.119 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/Internet.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/Internet.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/Internet.ycp Fri Jan 13 14:38:23 2012 @@ -159,7 +159,8 @@ // Skip test in case of NM because it returns code 3 (interface under NM controll) if(NetworkService::IsManaged ()){ y2milestone("Skipping interface status test because of NetworkManager"); - return true; + // only check if NM has not crashed + return SCR::Execute(.target.bash, "pgrep NetworkManager") == 0; } integer ret = (integer) SCR::Execute(.target.bash, "/sbin/ifstatus " + device); y2milestone ("ifstatus %1: %2", device, ret); Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Fri Jan 13 14:38:23 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 13 14:35:47 CET 2012 - mvidner(a)suse.cz + +- Internet test: fail early if NetworkManager has crashed + (bnc#739390). +- 2.17.119 + +------------------------------------------------------------------- Thu Jan 5 15:28:01 CET 2012 - mvidner(a)suse.cz - Relicensed ConfigHistory from GPL-2.0 to GPL-2.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] r67188 - in /branches/SuSE-Code-11-SP2-Branch/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 14:23:48 2012 New Revision: 67188 URL: http://svn.opensuse.org/viewcvs/yast?rev=67188&view=rev Log: Clarified the label for BOOTPROTO=none: "No Setup (Bridge or Bonding Slaves)" (bnc#737333). Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Fri Jan 13 14:23:48 2012 @@ -1 +1 @@ -2.17.165 +2.17.166 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Jan 13 14:23:48 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 12 15:52:47 CET 2012 - mvidner(a)suse.cz + +- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or + Bonding Slaves)" (bnc#737333). +- 2.17.166 + +------------------------------------------------------------------- Thu Jan 5 16:27:13 CET 2012 - mvidner(a)suse.cz - skip USB NICs during bridge proposal (bnc#710098) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Fri Jan 13 14:23:48 2012 @@ -225,7 +225,7 @@ void initBootProto (string key) { if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); else if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -680,7 +680,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")), + `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) -- 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] r67187 - in /branches/SuSE-Code-11-SP2-Branch/network/src: lan/hardware.ycp modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 14:23:44 2012 New Revision: 67187 URL: http://svn.opensuse.org/viewcvs/yast?rev=67187&view=rev Log: Removed dead code from Select, SetItem, S390Dialog. Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp Fri Jan 13 14:23:44 2012 @@ -602,7 +602,6 @@ /* TextEntry label */ `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), `VSpacing(1), -// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"), LanItems::qeth_chanids) `HBox( `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:""), @@ -620,29 +619,6 @@ _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); } -/* - if(LanItems::type == "hsi") { - contents = `HBox( - `HSpacing(6), - `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( - `VSpacing(1), - `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), - `VSpacing(1), - `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), - `VSpacing(1), - `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), - `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), - `VSpacing(1) - ), `HSpacing(2))), - `HSpacing(6) - ); - helptext = _("Enter any additional Options for this interface (separated by spaces).") + - _("Select Enable IPA Takeover if IP address takeover should be enabled for this interface.") + - _("Select Enable Layer 2 Support if this card has been configured with layer 2 support.") + - _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); - } -*/ - if(drvtype == "lcs") { list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); map<string, any> chanids_map = $[ @@ -775,8 +751,7 @@ LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } -// if (LanItems::type != "hsi") - LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); + LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); if(LanItems::type == "lcs") LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Fri Jan 13 14:23:44 2012 @@ -968,8 +968,6 @@ global define boolean Select(string dev) { y2debug("dev=%1", dev); map devmap = $[]; - /* dev=="" -> Add */ -// if(dev == "") { // defaults for a new device devmap = $[ // for hotplug devices set STARTMODE=hotplug (#132583) @@ -1000,91 +998,31 @@ } type = Items[current, "hwinfo", "type"]:"eth"; -// type = "eth0"; device = NetworkInterfaces::GetFreeDevice(type); - // FIXME: MOD AddModule(type); -// NetworkModules::AddM(); -// nm_name = NetworkModules::GetFreeName("static-"); - // TODO: instead of udev use hwinfo dev_name NetworkInterfaces::Name = GetItemUdev("NAME"); if (size(Items)<current) Items[current] = $["ifcfg":NetworkInterfaces::Name]; else Items[current, "ifcfg"] = NetworkInterfaces::Name; -// interfacename = GetItemUdev()[1]:""; - /* FIXME: alias: how to prefill new alias? */ alias = ""; -// } - /* dev!="" -> Edit */ -/* FIXME: NI: - else { - if(!CheckDevice(dev)) { - y2error("Device not found: %1", dev); - return false; - } - NetworkInterfaces::Edit(dev); - devmap = NetworkInterfaces::Current; - type = NetworkInterfaces::device_type(dev); - device = NetworkInterfaces::device_num(dev); - alias = NetworkInterfaces::alias_num(dev); - } -*/ + /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); hotplug = ""; - /* - if(issubstring(device, "bus-pcmcia")) - hotplug = "pcmcia"; - else if(issubstring(device, "bus-usb")) - hotplug = "usb"; - */ - y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ -// if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); -// } -// else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); -// } - -// qeth_options = NetworkModules::QETH_OPTIONS; -// chan_mode = NetworkModules::CCW_CHAN_MODE; -// lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - -/* - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ - /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; } - //if(bootproto == "none") bootproto = "static"; - return true; } @@ -1479,51 +1417,17 @@ if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(getCurrentItem()["ifcfg"]:""); device = getCurrentItem()["ifcfg"]:""; alias = NetworkInterfaces::alias_num(getCurrentItem()["ifcfg"]:""); -// nm_name = Items[current, "hwcfg"]:""; -// if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); -// NetworkModules::SelectM(nm_name); /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); - hotplug = ""; - y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ - if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); - } - else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); - } - -/* - qeth_options = NetworkModules::QETH_OPTIONS; - chan_mode = NetworkModules::CCW_CHAN_MODE; - lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0