May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64011 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 13:37:40 2011 New Revision: 64011 URL: http://svn.opensuse.org/viewcvs/yast?rev=64011&view=rev Log: improve edit dialog, write /etc/fcoe/cfg-ethx settings Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/dialogs.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 Tue May 17 13:37:40 2011 @@ -277,26 +277,29 @@ if ( content == "" || content == nil ) { // remove '-fcoe' and try again - y2milestone( "Reading %1", substring( file_name, 0, size(file_name)-5 ) ); - content = (string)SCR::Read(.target.string, substring( file_name, 0, size(file_name)-5 ) ); + file_name = substring( file_name, 0, size(file_name)-5 ); + y2milestone( "Reading %1", file_name ); + content = (string)SCR::Read(.target.string, file_name ); } if ( content == "" || content == nil ) { + string create_file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); y2milestone( "Cannot read cfg-file creating %1 with default values from /etc/fcoe/cfg-ethx", - file_name ); + create_file_name ); string def_values = (string)SCR::Read( .target.string, "/etc/fcoe/cfg-ethx" ); - if ( def_values != "" ) + if ( def_values != "" && def_values != nil ) { - boolean ret = SCR::Write( .target.string, file_name, def_values ); + boolean ret = SCR::Write( .target.string, create_file_name, def_values ); if ( ret == true ) { status_map = add( status_map, "FCOE_ENABLE", "yes"); status_map = add( status_map, "DCB_REQUIRED", "yes"); + status_map = add( status_map, "Filename", create_file_name ); } else { - y2error( "Cannot create %1", file_name ); + y2error( "Cannot create %1", create_file_name ); } } else @@ -322,6 +325,7 @@ status_map = add( status_map, "DCB_REQUIRED", deletechars( substring( line, 13 ),"\"") ); } }); + status_map = add( status_map, "Filename", file_name ); } else { @@ -513,14 +517,15 @@ dcb_capable = DCBCapable( card["dev_name"]:"" ); - 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 ); // VLAN interface, e.g. 200 - info_list = add( info_list, "no" ); // data not modified + info_list = add( info_list, card["dev_name"]:""); // 0 network card, e.g. eth3 + info_list = add( info_list, card["device"]:""); // 1 description + info_list = add( info_list, fcoe_vlan_interface ); // 2 FCoE VLAN interface, e.g. eth3.200 + info_list = add( info_list, dcb_capable ); // 3 DCB capable + info_list = add( info_list, status_map["FCOE_ENABLE"]:""); // 4 FCOE_ENABLE + info_list = add( info_list, status_map["DCB_REQUIRED"]:""); // 5 DCB_REQUIRED + info_list = add( info_list, vlan_interface ); // 6 VLAN interface, e.g. 200 + info_list = add( info_list, "no" ); // 7 data not modified + info_list = add( info_list, status_map["Filename"]:"" ); // 8 file name network_interfaces = add( network_interfaces, row, info_list ); row = row + 1; } ); @@ -618,6 +623,49 @@ return ret; } +boolean WriteCfgFiles() +{ + map <integer, list> netcards = GetNetworkCards(); + boolean success = true; + + foreach ( integer row, list card, (map<integer, list>)netcards, { + if ( card[7]:"no" == "yes" ) // data modified + { + string content = (string)SCR::Read( .target.string, card[8]:"" ); + y2milestone( "Original content: %1", content ); + + list <string> lines = (list<string>)splitstring( content, "\n" ); + lines = maplist( string line, lines, { + if ( regexpmatch( line, "^FCOE_ENABLE" ) ) + { + return sformat( "FCOE_ENABLE=\"%1\"", card[4]:"no" ); + } + else if ( regexpmatch( line, "^DCB_REQUIRED" ) ) + { + return sformat( "DCB_REQUIRED=\"%1\"", card[5]:"no" ); + } + else + { + return line; + } + }); + content = mergestring( lines, "\n" ); + y2milestone( "Modified content: %1", content ); + + boolean ret = SCR::Write( .target.string, card[8]:"", content ); + if ( !ret ) + y2error( "Cannot write %1", card[8]:"" ); + else + y2milestone( "%1 written", card[8]:"" ); + + if ( success ) + success = ret; + } + } ); + + return success; +} + /** * Read all fcoe-client settings * @return true on success @@ -754,11 +802,14 @@ Progress::NextStage(); boolean success = WriteFcoeConfig(); - /* Error message */ if( !success ) Report::Error (_("Cannot write settings to /etc/fcoe/config.")); sleep(sl); + success = WriteCfgFiles(); + if( !success ) Report::Error (_("Cannot write settings for FCoE interfaces. +For details see /var/log/YaST2/y2log") ); + // run SuSEconfig if(Abort()) 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 Tue May 17 13:37:40 2011 @@ -214,6 +214,7 @@ // set values for 'FCoE Enabled' and 'DCB Required' UI::ChangeWidget( `id(`fcoe), `Value, card[4]:"" ); UI::ChangeWidget( `id(`dcb), `Value, card[5]:"" ); + UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of Interface %1"), card[2]:"" ) ); } /** @@ -339,7 +340,7 @@ y2milestone( "Setting auto start of FCoE to true"); } - boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("llpad_startup_auto"), `Value ); + boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("lldpad_startup_auto"), `Value ); if ( lldpad_auto ) { @@ -365,22 +366,23 @@ 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 ); if ( card[4]:"" != fcoe_enabled ) { card[4] = fcoe_enabled; - modified = "yes"; + card[7] = "yes"; // set modified to "yes" } + string dcb_required = (string)UI::QueryWidget( `id(`dcb), `Value ); if ( card[5]:"" != dcb_required ) { card[5] = dcb_required; - modified = "yes"; + card[7] = "yes"; // set modified to "yes" } - card[7] = modified; + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); y2milestone( "Current data: %1", FcoeClient::GetNetworkCards() ); Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Tue May 17 13:37:40 2011 @@ -63,24 +63,27 @@ { return `VBox( `VStretch(), - `HBox( - `HStretch(), - `HSpacing (1), - `VBox( - `ComboBox( `id(`fcoe), _("FCoE Enable"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2), - `ComboBox( `id(`dcb), _("DCB Required"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2) - ), - `HSpacing (1), - `HStretch() - ), + // heading is replaced later (InitEditDialog) + `Label( `id(`heading), ("Configuration of Interface ...................") ), + `HBox ( + `HStretch(), + `Frame( _(""), + `VBox( + `VSpacing(2), + `ComboBox( `id(`fcoe), _("FCoE Enable"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2), + `ComboBox( `id(`dcb), _("DCB Required"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2) + ) + ), + `HStretch() + ), `VStretch() ); } -- 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] r64010 - /tags/branch-Code-11-SP2-2_17_38/core/
by fehr＠svn2.opensuse.org 17 May '11

17 May '11

Author: fehr Date: Tue May 17 13:15:04 2011 New Revision: 64010 URL: http://svn.opensuse.org/viewcvs/yast?rev=64010&view=rev Log: Created tag branch-Code-11-SP2-2_17_38 for core Added: tags/branch-Code-11-SP2-2_17_38/core/ (props changed) - copied from r64009, branches/SuSE-Code-11-SP2-Branch/core/ -- 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] r64009 - /tags/branch-Code-11-SP2-2_17_38/
by fehr＠svn2.opensuse.org 17 May '11

17 May '11

Author: fehr Date: Tue May 17 13:15:02 2011 New Revision: 64009 URL: http://svn.opensuse.org/viewcvs/yast?rev=64009&view=rev Log: Created tag branch-Code-11-SP2-2_17_38 Added: tags/branch-Code-11-SP2-2_17_38/ -- 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] r64008 - in /branches/SuSE-Code-11-SP2-Branch/core: VERSION libycp/src/include/ycp/pathsearch.h libycp/src/pathsearch.cc package/yast2-core.changes yast2-core.spec.in
by fehr＠svn2.opensuse.org 17 May '11

17 May '11

Author: fehr Date: Tue May 17 13:14:54 2011 New Revision: 64008 URL: http://svn.opensuse.org/viewcvs/yast?rev=64008&view=rev Log: - backported allow Y2DIR to be a list of paths separated by ":" - 2.17.38 Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/pathsearch.h branches/SuSE-Code-11-SP2-Branch/core/libycp/src/pathsearch.cc branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes branches/SuSE-Code-11-SP2-Branch/core/yast2-core.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/core/VERSION Tue May 17 13:14:54 2011 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/pathsearch.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/pathsearch.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/pathsearch.h Tue May 17 13:14:54 2011 @@ -29,8 +29,10 @@ #include <string> #include <list> +#include <vector> using std::string; +using std::vector; class Y2PathSearch @@ -100,9 +102,13 @@ protected: static bool searchPrefixWarn; + static vector<string> getPaths(); + private: static int defaultComponentLevel (); + static vector<string> paths; + static void initializePaths(); }; /** Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/pathsearch.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/pathsearch.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/pathsearch.cc Tue May 17 13:14:54 2011 @@ -28,105 +28,103 @@ #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> +#include <boost/algorithm/string.hpp> #include <ycp/y2log.h> #include "pathsearch.h" -// watch out, duplicated in YCPPathSearch::initialize -static const char *paths[] = + +bool Y2PathSearch::searchPrefixWarn = true; + + +vector<string> +Y2PathSearch::getPaths() { - "/y2update", // Necessary during installation, but - // can be achieved using -I and -M in - // the yast2 start script - // And more unimplemented stuff for scrconf... - "Y2DIR", // replace with env. var. Y2DIR - "HOME", // replace with users home dir + /.yast2 - YAST2DIR -}; + vector<string> ret; + ret.push_back(string("/y2update")); -static const int NUM_LEVELS = sizeof (paths) / sizeof (paths[0]); + const char* y2dir = getenv("Y2DIR"); + if (y2dir) + { + vector<string> y2dirs; + boost::split(y2dirs, y2dir, boost::is_any_of(":")); + for (vector<string>::const_iterator it = y2dirs.begin(); it != y2dirs.end(); ++it) + { + if (*it != YAST2DIR) // prevent path duplication + ret.push_back(*it); + } + } + + const char* home = getenv("HOME"); + if (home) + { + ret.push_back(string(home) + "/.yast2"); + } + + ret.push_back(string(YAST2DIR)); + + y2debug("getPaths %s", boost::join(ret, " ").c_str()); + + return ret; +} + + +vector<string> Y2PathSearch::paths; + + +void +Y2PathSearch::initializePaths() +{ + if (paths.empty()) + paths = getPaths(); +} -bool Y2PathSearch::searchPrefixWarn = true; int -Y2PathSearch::numberOfComponentLevels () +Y2PathSearch::numberOfComponentLevels() { - return NUM_LEVELS; + initializePaths(); + return paths.size(); } string Y2PathSearch::searchPath (WHAT what, int level) { - static string *my_paths = 0; - - if (!my_paths) - { - // note: never deleted - my_paths = new string [NUM_LEVELS]; + initializePaths(); - const char *home = getenv ("HOME"); - const char *y2dir = getenv ("Y2DIR"); - - for (int i = 0; i < NUM_LEVELS; i++) - { - // #330965, avoid publicly writable dirs in search path - // (we return a nonexistent dir because the API does not - // allow us to say Skip, and a cleanup patch to fix that - // would be too large) - static const char * not_there = YAST2DIR "/not-there"; - if (strcmp (paths[i], "HOME") == 0) - { - if (home) - my_paths[i] = string (home) + "/.yast2"; - else - my_paths[i] = string (not_there); - } - else if (strcmp (paths[i], "Y2DIR") == 0) - { - if (y2dir - && (strcmp (YAST2DIR, y2dir) != 0)) // prevent path duplication - my_paths[i] = string (y2dir); - else - my_paths[i] = string (not_there); - } - else - { - my_paths[i] = string (paths[i]); - } - } - } + int levels = paths.size(); switch (what) { case EXECCOMP: - if (level == NUM_LEVELS - 1) // FIXME + if (level == levels - 1) // FIXME { return EXECCOMPDIR; } else { - return my_paths[level]; + return paths[level]; } break; case PLUGIN: - if (level == NUM_LEVELS - 1) // FIXME + if (level == levels - 1) // FIXME { return PLUGINDIR; } else { - return my_paths[level] + "/plugin"; + return paths[level] + "/plugin"; } break; default: break; } - return my_paths[level]; + return paths[level]; } @@ -166,7 +164,10 @@ string Y2PathSearch::findy2 (string filename, int mode, int level) { - for (int i = 0; i < NUM_LEVELS; i++) + initializePaths(); + + int levels = paths.size(); + for (int i = 0; i < levels; i++) { // for level == -1, all levels are scanned if ((level >= 0) && (i != level)) @@ -180,7 +181,7 @@ if (access (pathname.c_str(), mode) == 0) { // FIXME: this check is different for clients and for modules - see find - if( searchPrefixWarn && i != NUM_LEVELS-1 ) + if( searchPrefixWarn && i != levels - 1 ) { y2warning( "Using special search prefix '%s' for '%s'",searchPath (GENERIC, i).c_str(), pathname.c_str() ); } @@ -247,7 +248,10 @@ int Y2PathSearch::defaultComponentLevel () { - for (int i = 0; i < NUM_LEVELS; i++) + initializePaths(); + + int levels = paths.size(); + for (int i = 0; i < levels; i++) { if (searchPath (GENERIC, i) == YAST2DIR) { @@ -255,7 +259,7 @@ } } /* NOTREACHED */ - return NUM_LEVELS - 1; + return levels - 1; } @@ -264,7 +268,7 @@ { // Determine current component level int current_level = defaultComponentLevel (); - char *levelstring = getenv ("Y2LEVEL"); + const char* levelstring = getenv ("Y2LEVEL"); if (levelstring) { current_level = atoi (levelstring); @@ -277,26 +281,15 @@ bool YCPPathSearch::initialized = false; -// watch out, duplicated in char *paths[] + void YCPPathSearch::initialize (Kind kind, const char *suffix) { - const char *home = getenv ("HOME"); - const char *y2dir = getenv ("Y2DIR"); - searchPrefixWarn = (getenv ("Y2SILENTSEARCH") == NULL); - addPath (kind, string (YAST2DIR) + suffix); - if (home) - { - string homey2 = string (home) + "/.yast2"; - addPath (kind, homey2 + suffix); - } - if (y2dir) - { - addPath (kind, string (y2dir) + suffix); - } - addPath (kind, string ("/y2update") + suffix); + vector<string> paths = getPaths(); + for (vector<string>::const_reverse_iterator it = paths.rbegin(); it != paths.rend(); ++it) + addPath(kind, *it + suffix); } Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Tue May 17 13:14:54 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 17 11:39:41 CEST 2011 - fehr(a)suse.de + +- backported allow Y2DIR to be a list of paths separated by ":" +- 2.17.38 + +------------------------------------------------------------------- Thu May 05 17:24:04 CEST 2011 - aschnell(a)suse.de - backported multiset builtins needed by storage and iscsi Modified: branches/SuSE-Code-11-SP2-Branch/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/yast2-core.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/core/yast2-core.spec.in Tue May 17 13:14:54 2011 @@ -3,7 +3,7 @@ @HEADER@ # obviously -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ boost-devel # we have a parser BuildRequires: flex bison # needed for all yast packages -- 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] r64007 - /tags/branch-Code-11-SP1-2_17_0/testsuite/
by fehr＠svn2.opensuse.org 17 May '11

17 May '11

Author: fehr Date: Tue May 17 13:03:17 2011 New Revision: 64007 URL: http://svn.opensuse.org/viewcvs/yast?rev=64007&view=rev Log: Created tag branch-Code-11-SP1-2_17_0 for testsuite Added: tags/branch-Code-11-SP1-2_17_0/testsuite/ (props changed) - copied from r64006, branches/SuSE-Code-11-SP1-Branch/testsuite/ -- 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] r64006 - in /branches/SuSE-Code-11-SP1-Branch/testsuite: VERSION package/yast2-testsuite.changes skel/Makefile.testsuite.in skel/runtest.sh skel/testsuite.exp
by fehr＠svn2.opensuse.org 17 May '11

17 May '11

Author: fehr Date: Tue May 17 13:03:04 2011 New Revision: 64006 URL: http://svn.opensuse.org/viewcvs/yast?rev=64006&view=rev Log: - backport changes by Arvin needed for ycp testsuite in storage - don't override Makefile.am - extended runtest.sh - run all tests even if some fail - 2.17.0 Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION Tue May 17 13:03:04 2011 @@ -1 +1 @@ -2.16.2 +2.17.0 Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes Tue May 17 13:03:04 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue May 17 11:16:32 CEST 2011 - fehr(a)suse.de + +- backport changes by Arvin needed for ycp testsuite in storage +- don't override Makefile.am +- extended runtest.sh +- run all tests even if some fail +- 2.17.0 + +------------------------------------------------------------------- Tue Apr 8 13:09:41 CEST 2008 - mvidner(a)suse.cz - Enable make check before make install, by telling y2base to search Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in Tue May 17 13:03:04 2011 @@ -14,7 +14,7 @@ files_config=$(srcdir)/config/default.exp $(srcdir)/config/unix.exp $(srcdir)/config/unknown.exp files_run=$(srcdir)/run/runtest.sh files_test=$(srcdir)/$(RPMNAME).test/testsuite.exp -files_tmpl=$(srcdir)/Makefile.am $(srcdir)/.cvsignore +files_tmpl=$(srcdir)/.cvsignore files_all=$(files_config) $(files_test) $(files_tmpl) $(files_run) all: $(files_all) $(testsuite_dirs) @@ -28,11 +28,8 @@ # Overwrite the tested package's testsuite/Makefile.am only # if the template file is newer in content (which shouldn't # happen as it is only a proxy). Prevents automake mismatch errors. -$(srcdir)/Makefile.am: $(skeldir)/Makefile_am - cmp -s $< $@ || cp -f $< $@ - -$(srcdir)/.cvsignore: $(skeldir)/_cvsignore - cp -f $< $@ +#$(srcdir)/Makefile.am: $(skeldir)/Makefile_am +# cmp -s $< $@ || cp -f $< $@ $(srcdir)/run/runtest.sh: $(skeldir)/runtest.sh run cp -f $< $@ Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh Tue May 17 13:03:04 2011 @@ -77,7 +77,7 @@ rm -f "$file" } -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" +( Y2DIR=$Y2DIR:$Y2BASE_Y2DIR LD_LIBRARY_PATH=$Y2BASE_LD_LIBRARY_PATH $Y2BASE -l - -c "$logconf" $Y2BASEFLAGS $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp Tue May 17 13:03:04 2011 @@ -19,10 +19,6 @@ puts "\nChecking started\n" -foreach file $filenames { - if {[testsuite-run $file] < 0} { - return - } -} +foreach file $filenames { testsuite-run $file } puts "\nChecking finished\n" -- 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] r64005 - /tags/stable-2_21_3/ncurses/
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:45:32 2011 New Revision: 64005 URL: http://svn.opensuse.org/viewcvs/yast?rev=64005&view=rev Log: Created tag stable-2_21_3 for ncurses Added: tags/stable-2_21_3/ncurses/ - copied from r64004, 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] r64004 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:41:49 2011 New Revision: 64004 URL: http://svn.opensuse.org/viewcvs/yast?rev=64004&view=rev Log: 2.21.3 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=64004&r1=640… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue May 17 11:41:49 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue May 17 11:41:49 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue May 17 11:36:16 CEST 2011 - gs(a)suse.de + +- NCInputField: return event reason 'Activated' on key 'Return' +- V 2.21.3 + +------------------------------------------------------------------- +Mon May 9 09:59:12 UTC 2011 - cgiboudeaux(a)gmx.com + +- Add gcc46_build_fix.patch + +------------------------------------------------------------------- Tue Apr 26 11:05:41 CEST 2011 - gs(a)suse.de - NCTree: use default params for multi selection options -- 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] r64003 - /trunk/ncurses/src/NCInputField.cc
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:36:00 2011 New Revision: 64003 URL: http://svn.opensuse.org/viewcvs/yast?rev=64003&view=rev Log: bugfix: return NCursesEvent::Activated on KEY_RETURN Modified: trunk/ncurses/src/NCInputField.cc Modified: trunk/ncurses/src/NCInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCInputField.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCInputField.cc (original) +++ trunk/ncurses/src/NCInputField.cc Tue May 17 11:36:00 2011 @@ -457,7 +457,8 @@ break; case KEY_RETURN: - + update = false; + if ( notify() || returnOnReturn_b ) ret = NCursesEvent::Activated; -- 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] r64002 - /trunk/ncurses/src/NCTable.cc
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:25:16 2011 New Revision: 64002 URL: http://svn.opensuse.org/viewcvs/yast?rev=64002&view=rev Log: gcc46_build_fix (provided by cgiboudeaux) Diese und die folgenden Zeilen werden ignoriert -- M NCTable.cc Modified: trunk/ncurses/src/NCTable.cc Modified: trunk/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTable.cc?rev=64002… ============================================================================== --- trunk/ncurses/src/NCTable.cc (original) +++ trunk/ncurses/src/NCTable.cc Tue May 17 11:25:16 2011 @@ -356,7 +356,7 @@ yuiMilestone() << item->label() << " is selected: " << (selected?"yes":"no") << endl; - NCTableTag *tag = static_cast<const NCTableTag *>( line->GetCol( 0 ) ); + NCTableTag *tag = static_cast<NCTableTag *>( line->GetCol( 0 ) ); tag->SetSelected( selected ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0