May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63971 - /tags/stable-2_21_0/fcoe-client/
by gs＠svn2.opensuse.org 12 May '11

12 May '11

Author: gs Date: Thu May 12 12:04:16 2011 New Revision: 63971 URL: http://svn.opensuse.org/viewcvs/yast?rev=63971&view=rev Log: Created tag stable-2_21_0 for fcoe-client Added: tags/stable-2_21_0/fcoe-client/ - copied from r63970, 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] r63970 - /branches/tmp/dmacvicar/zc10/qt/yast2-qt.spec.in
by dmacvicar＠svn2.opensuse.org 12 May '11

12 May '11

Author: dmacvicar Date: Thu May 12 11:45:16 2011 New Revision: 63970 URL: http://svn.opensuse.org/viewcvs/yast?rev=63970&view=rev Log: require right libzypp Modified: branches/tmp/dmacvicar/zc10/qt/yast2-qt.spec.in Modified: branches/tmp/dmacvicar/zc10/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/yast2-q… ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/yast2-qt.spec.in (original) +++ branches/tmp/dmacvicar/zc10/qt/yast2-qt.spec.in Thu May 12 11:45:16 2011 @@ -2,11 +2,12 @@ @HEADER@ -BuildRequires: dbus-1-devel boost-devel libzypp-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel +BuildRequires: libzypp-devel >= 6.35.3 +BuildRequires: dbus-1-devel boost-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel Summary: - Requires: yast2-core >= 2.13.39 -Requires: libzypp >= 2.12.1 +Requires: libzypp >= 6.35.3 Provides: yast2_ui Provides: y2base:/var/lib/YaST2/servers/qt Provides: y2base:/usr/lib/YaST2/servers/qt -- 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] r63969 - /tags/branch-Code-11-SP2-2_17_0/fcoe-client/
by gs＠svn2.opensuse.org 12 May '11

12 May '11

Author: gs Date: Thu May 12 11:28:30 2011 New Revision: 63969 URL: http://svn.opensuse.org/viewcvs/yast?rev=63969&view=rev Log: Created tag branch-Code-11-SP2-2_17_0 for fcoe-client Added: tags/branch-Code-11-SP2-2_17_0/fcoe-client/ - copied from r63968, branches/SuSE-Code-11-SP2-Branch/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] r63968 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 12 May '11

12 May '11

Author: gs Date: Thu May 12 11:27:48 2011 New Revision: 63968 URL: http://svn.opensuse.org/viewcvs/yast?rev=63968&view=rev Log: initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0initial version 2.17.0 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Thu May 12 11:27:48 2011 @@ -1 +1 @@ -2.21.0 +2.17.0 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Thu May 12 11:27:48 2011 @@ -1,5 +1,6 @@ ------------------------------------------------------------------- -Tue Apr 19 12:42:00 2011 - gs(a)suse.de +Thu May 12 11:27:02 CEST 2011 - gs(a)suse.de - initial version -- V 2.21.0 +- V 2.17.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] r63967 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/
by gs＠svn2.opensuse.org 12 May '11

12 May '11

Author: gs Date: Thu May 12 11:25:06 2011 New Revision: 63967 URL: http://svn.opensuse.org/viewcvs/yast?rev=63967&view=rev Log: create fcoe-client in SuSE-Code-11-SP2-Branch Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/ - copied from r63966, 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] r63966 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp
by gs＠svn2.opensuse.org 12 May '11

12 May '11

Author: gs Date: Thu May 12 11:22:45 2011 New Revision: 63966 URL: http://svn.opensuse.org/viewcvs/yast?rev=63966&view=rev Log: bugfix setting modified Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.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 Thu May 12 11:22:45 2011 @@ -469,9 +469,9 @@ } // -// dev_name device FCoE VLAN DCB capable FCoE enable VLAN data modified -// eth3 Ethernet card ... eth3.200 yes/no yes/no 200 yes/no -// 0 1 2 3 4 5 6 +// dev_name device FCoE VLAN DCB capable FCoE enable DCB required VLAN data modified +// eth3 Ethernet card ... eth3.200 yes/no yes/no yes/no 200 yes/no +// 0 1 2 3 4 5 6 7 // // Detect network interface cards (hardware probe) and get status // 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 Thu May 12 11:22:45 2011 @@ -380,8 +380,10 @@ card[5] = dcb_required; modified = "yes"; } - card[6] = modified; - FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + card[7] = modified; + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + + y2milestone( "Current data: %1", FcoeClient::GetNetworkCards() ); } /* EOF */ -- 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] r63965 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp
by gs＠svn2.opensuse.org 12 May '11

12 May '11

Author: gs Date: Thu May 12 11:12:19 2011 New Revision: 63965 URL: http://svn.opensuse.org/viewcvs/yast?rev=63965&view=rev Log: info about data modified added Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.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 Thu May 12 11:12:19 2011 @@ -337,13 +337,12 @@ string DCBCapable( string netcard ) { string ret = "no"; - + + // 'lldpad' must be started to be able to use 'dcbtool' + // -> is started in ServiceStatus() ( called in Read() before DetectNetworkCards() ) string command = sformat( "LANG=POSIX dcbtool gc %1 dcb", netcard ); y2milestone( "Executing command: %1", command ); - // TODO: lldpad must be started to be able to use dcbtool - // -> started in CheckServices() -> Read() - // ACHTUNG: Reihenfolge !!!# map output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output); string status = ""; @@ -470,6 +469,10 @@ } // +// dev_name device FCoE VLAN DCB capable FCoE enable VLAN data modified +// eth3 Ethernet card ... eth3.200 yes/no yes/no 200 yes/no +// 0 1 2 3 4 5 6 +// // Detect network interface cards (hardware probe) and get status // void DetectNetworkCards() @@ -510,14 +513,14 @@ dcb_capable = DCBCapable( card["dev_name"]:"" ); - info_list = add( info_list, card["dev_name"]:""); - info_list = add( info_list, card["device"]:""); - info_list = add( info_list, fcoe_vlan_interface ); - info_list = add( info_list, dcb_capable ); + info_list = add( info_list, card["dev_name"]:""); // network card, e.g. eth3 + info_list = add( info_list, card["device"]:""); // description + info_list = add( info_list, fcoe_vlan_interface ); // FCoE VLAN interface, e.g. eth3.200 + info_list = add( info_list, dcb_capable ); // DCB capable info_list = add( info_list, status_map["FCOE_ENABLE"]:""); info_list = add( info_list, status_map["DCB_REQUIRED"]:""); - info_list = add( info_list, vlan_interface ); - + info_list = add( info_list, vlan_interface ); // VLAN interface, e.g. 200 + info_list = add( info_list, "no" ); // data not modified network_interfaces = add( network_interfaces, row, info_list ); row = row + 1; } ); 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 Thu May 12 11:12:19 2011 @@ -365,12 +365,22 @@ void StoreEditDialog (string id, map event) { y2milestone( "Store edit dialog" ); + string modified = "no"; + list <string> card = FcoeClient::GetCurrentNetworkCard(); string fcoe_enabled = (string)UI::QueryWidget( `id(`fcoe), `Value ); - card[4] = fcoe_enabled; + if ( card[4]:"" != fcoe_enabled ) + { + card[4] = fcoe_enabled; + modified = "yes"; + } string dcb_required = (string)UI::QueryWidget( `id(`dcb), `Value ); - card[5] = dcb_required; - + if ( card[5]:"" != dcb_required ) + { + card[5] = dcb_required; + modified = "yes"; + } + card[6] = modified; FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); } -- 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] r63964 - in /branches/tmp/dmacvicar/zc10/qt/src: YQPkgLangList.cc YQPkgObjList.cc include/YQPkgObjList.h
by dmacvicar＠svn2.opensuse.org 11 May '11

11 May '11

Author: dmacvicar Date: Wed May 11 15:57:41 2011 New Revision: 63964 URL: http://svn.opensuse.org/viewcvs/yast?rev=63964&view=rev Log: fix crash with languages and add missing implementation of a method Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/YQP… ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc (original) +++ branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc Wed May 11 15:57:41 2011 @@ -104,22 +104,22 @@ zypp::sat::LocaleSupport myLocale( lang ); for_( it, myLocale.selectableBegin(), myLocale.selectableEnd() ) - { + { ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); if ( zyppPkg ) { if ( (*it)->installedSize() > 0 ) ++installed; ++total; - + emit filterMatch( *it, zyppPkg ); } } //selection()->setInstalledPackages(installed); //selection()->setTotalPackages(total); - + //selection()->setText( _summaryCol, QString().sprintf("%s (%d/%d)", zyppPattern->summary().c_str(), installed, total)); - + } emit filterFinished(); } @@ -142,6 +142,19 @@ return dynamic_cast<YQPkgLangListItem *> (item); } +void +YQPkgLangList::updateActions( YQPkgObjListItem * item) +{ + actionSetCurrentInstall->setEnabled( true ); + actionSetCurrentDontInstall->setEnabled( true ); + actionSetCurrentTaboo->setEnabled( true ); + actionSetCurrentProtected->setEnabled( false ); + + actionSetCurrentKeepInstalled->setEnabled( false ); + actionSetCurrentDelete->setEnabled( false ); + actionSetCurrentUpdate->setEnabled( false ); +} + YQPkgLangListItem::YQPkgLangListItem( YQPkgLangList * langList, const zypp::Locale & lang ) : YQPkgObjListItem( langList ) @@ -195,7 +208,7 @@ YQPkgLangListItem::setStatus( ZyppStatus newStatus, bool sendSignals ) { ZyppStatus oldStatus = status(); - + switch ( newStatus ) { case S_Install: Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/YQP… ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc (original) +++ branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc Wed May 11 15:57:41 2011 @@ -23,7 +23,6 @@ #include <qpixmap.h> #include <qheader.h> #include <qpopupmenu.h> -#include <qaction.h> #include "utf8.h" @@ -1185,9 +1184,9 @@ // but whose dependencies are broken (no longer satisfied) return _( "Dependencies broken" ); } - + // don't use "else if" here, it might be the same colum as another one! - + if ( col == satisfiedIconCol() ) { if ( isSatisfied() ) Modified: branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/inc… ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h (original) +++ branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h Wed May 11 15:57:41 2011 @@ -23,13 +23,14 @@ #define YQPkgObjList_h #include <qpixmap.h> +#include <qaction.h> + #include <QY2ListView.h> #include "YQZypp.h" #include <zypp/Edition.h> #include <y2util/FSize.h> class YQPkgObjListItem; -class QAction; class QPopupMenu; using std::string; @@ -404,7 +405,7 @@ * Returns 'true' if this selectable's status is set by a selection * (rather than by the user or by the dependency solver). **/ - bool bySelection() const; + virtual bool bySelection() const; /** * Set the (binary RPM) package status. @@ -520,9 +521,9 @@ **/ virtual QString toolTip( int column ); - + // Handle Debug isBroken and isSatisfied flags - + bool debugIsBroken() const { return _debugIsBroken; } bool debugIsSatisfied() const { return _debugIsSatisfied; } void setDebugIsBroken ( bool val = true ) { _debugIsBroken = val; } -- 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] r63963 - /branches/SuSE-Code-11-SP2-Branch/yast2/VERSION
by aschnell＠svn2.opensuse.org 11 May '11

11 May '11

Author: aschnell Date: Wed May 11 15:13:18 2011 New Revision: 63963 URL: http://svn.opensuse.org/viewcvs/yast?rev=63963&view=rev Log: - increased version Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION 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 Wed May 11 15:13:18 2011 @@ -1 +1 @@ -2.17.93 +2.17.94 -- 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] r63962 - in /branches/SuSE-Code-11-SP2-Branch/yast2: data/sysconfig.yast2 package/yast2.changes scripts/yast2
by aschnell＠svn2.opensuse.org 11 May '11

11 May '11

Author: aschnell Date: Wed May 11 15:10:20 2011 New Revision: 63962 URL: http://svn.opensuse.org/viewcvs/yast?rev=63962&view=rev Log: - added snapper call to yast2 script Modified: branches/SuSE-Code-11-SP2-Branch/yast2/data/sysconfig.yast2 branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/data/sysconfig.yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/data/sysconfig.yast2 (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/data/sysconfig.yast2 Wed May 11 15:10:20 2011 @@ -52,3 +52,8 @@ # This option is experimental and not all YaST modules do support # configuration tracking via subversion SUBVERSION_ADD_DIRS_RECURSIVE="no" + +## Type: list(yes,no) +## Default: "yes" +# Enable use of snapper for YaST. +USE_SNAPPER="yes" 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 Wed May 11 15:10:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 11 15:05:22 CEST 2011 - aschnell(a)suse.de + +- added snapper call to yast2 script +- 2.17.94 + +------------------------------------------------------------------- Fri May 06 11:47:03 CEST 2011 - aschnell(a)suse.de - backported some modules and functions need by storage Modified: branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 Wed May 11 15:10:20 2011 @@ -188,6 +188,28 @@ fi } + +SNAPPERBIN=/usr/bin/snapper + +snapshot_pre() +{ + if [ "$1" != "menu" ] ; then + if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then + SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --cleanup=number --print-number --description="yast $1"` + fi + fi +} + +snapshot_post() +{ + if [ "$1" != "menu" ] ; then + if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then + $SNAPPERBIN create --type=post --cleanup=number --pre-number=$SNAPSHOT_NUMBER + fi + fi +} + + TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen,noborder,qt,gtk,ncurses \ -n 'yast2' -- "$@"` @@ -432,6 +454,7 @@ # all other cases when YaST has to be restarted *) REDO_FILE=/var/lib/YaST2/restart_yast ;; esac + snapshot_pre $module # break out on errors, #343258 while [ $exit_code = 0 ]; do $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2UI_ARGS @@ -440,6 +463,7 @@ break fi done + snapshot_post $module fi # cleanup -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0