October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41342 - in /trunk/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp src/routines/routines.ycp
by mzugec＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mzugec Date: Wed Oct 10 18:20:08 2007 New Revision: 41342 URL: http://svn.opensuse.org/viewcvs/yast?rev=41342&view=rev Log: fixed displayed name for network device (#330994) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanItems.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41342&r1=413… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 10 18:20:08 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 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 Wed Oct 10 18:20:08 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 18:19:37 CEST 2007 - mzugec(a)suse.cz + +- fixed displayed name for network device (#330994) +- 2.16.3 + +------------------------------------------------------------------- Wed Oct 10 10:39:47 CEST 2007 - kmachalkova(a)suse.cz - Escape backslashes in usernames also in .curlrc (#331038) 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 Wed Oct 10 18:20:08 2007 @@ -325,7 +325,7 @@ foreach(integer key, (list<integer>)Map::Keys(Items), { string rich = ""; string ip = _("Not configured"); - string descr = HardwareName (Hardware, Items[key, "hwinfo", "dev_name"]:""); + string descr = Items[key, "hwinfo", "name"]:""; type = Items[key, "hwinfo", "type"]:""; descr = CheckEmptyName (type, descr); list <string> bullets = []; Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.yc… ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Wed Oct 10 18:20:08 2007 @@ -428,6 +428,8 @@ string vendor = ""; string dev = ""; + if (hasAnyValue(hwdevice["device"]:"")) return hwdevice["device"]:""; + model = hwdevice["model"]:""; if(model != "" && model != nil) return model; -- 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] r41341 - in /trunk/storage: libstorage/src/Volume.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: fehr Date: Wed Oct 10 17:28:56 2007 New Revision: 41341 URL: http://svn.opensuse.org/viewcvs/yast?rev=41341&view=rev Log: if ntfs-3g mount fails during install just use a ntfs mount to prevent failing of installation in such a case (#331804) Modified: trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed Oct 10 17:28:56 2007 @@ -1128,7 +1128,11 @@ ret = checkDevice(mountDevice()); } if( ret==0 ) + { ret = mount( lmount ); + if( ret!=0 && cont->getStorage()->instsys() && fs==NTFS ) + ret = mount( lmount, true ); + } } if( ret==0 ) { 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 Wed Oct 10 17:28:56 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 17:25:18 CEST 2007 - fehr(a)suse.de + +- if ntfs-3g mount fails during install just use a ntfs mount + to prevent failing of installation in such a case (#331804) + +------------------------------------------------------------------- Tue Oct 02 18:44:07 CEST 2007 - aschnell(a)suse.de - fixed compiling with gcc 4.3 -- 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] r41340 - /trunk/pos-installation/control/installation.xml
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 17:00:05 2007 New Revision: 41340 URL: http://svn.opensuse.org/viewcvs/yast?rev=41340&view=rev Log: Updated workflows Added new workflow for the New Installation (Slepos Pattern Selector) Modified: trunk/pos-installation/control/installation.xml Modified: trunk/pos-installation/control/installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/install… ============================================================================== --- trunk/pos-installation/control/installation.xml (original) +++ trunk/pos-installation/control/installation.xml Wed Oct 10 17:00:05 2007 @@ -5,6 +5,8 @@ <workflows config:type="list"> +  <workflow> <defaults> <enable_back>no</enable_back> @@ -38,7 +40,9 @@ </workflows> <update> + <workflows config:type="list"> +  <workflow> <defaults> <enable_back>yes</enable_back> @@ -57,11 +61,41 @@ <module> <label>Data Migration</label> <name>slepos_data_migration</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> </module> </modules> </insert_module> </insert_modules> </workflow> + +  + <workflow> + <defaults> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </defaults> + +  + <stage>initial</stage> + <mode>installation</mode> + +  + <insert_modules config:type="list"> + <insert_module> + <before>proposal</before> + <modules config:type="list"> + <module> + <label>Server Type Selection</label> + <name>slepos_server_selection</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + </modules> + </insert_module> + </insert_modules> + </workflow> + </workflows> </update> </productDefines> -- 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] r41339 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/YGUtils.cc src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: rpmcruz Date: Wed Oct 10 16:54:01 2007 New Revision: 41339 URL: http://svn.opensuse.org/viewcvs/yast?rev=41339&view=rev Log: * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to map patterns wanted packages for the packages in the pool. * fixed a couple of warnings. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41339&r1=41338… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Oct 10 16:54:01 2007 @@ -1,3 +1,10 @@ +2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to + map patterns wanted packages for the packages in the pool. + + * fixed a couple of warnings. + 2007-10-03 Boyd Timothy <btimothy(a)novell.com> * src/YGPackageSelector.cc: Use the "available" name to sort Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Wed Oct 10 16:54:01 2007 @@ -1503,7 +1503,7 @@ zyppPool().byKindBegin <zypp::Package>(); pt2 != zyppPool().byKindEnd <zypp::Package>(); pt2++) { ZyppSelectable sel = *pt2; - if (YGUtils::contains (sel->name(), *pt1)) { + if (sel->name() == *pt1) { gtk_tree_store_append (store, &package_iter, &pattern_iter); loadPackageRow (model, &package_iter, sel); } @@ -1783,7 +1783,7 @@ // to finish writting if (pThis->search_timeout_id) g_source_remove (pThis->search_timeout_id); - pThis->search_timeout_id = g_timeout_add (1000, search_cb, pThis); + pThis->search_timeout_id = g_timeout_add (500, search_cb, pThis); } struct FindClosure { Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=41339&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Wed Oct 10 16:54:01 2007 @@ -82,7 +82,7 @@  */ static bool dont_escape (const string &str) { - char *comment = ""; + const char *comment = ""; if (str.length() < sizeof (comment)) return false; for (unsigned int i = 0; i < sizeof (comment); i++) Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=41339… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Wed Oct 10 16:54:01 2007 @@ -519,7 +519,7 @@ rt_error }; -GtkWidget *ygtk_richtext_new() +GtkWidget *ygtk_richtext_new (void) { return g_object_new (YGTK_TYPE_RICHTEXT, NULL); } -- 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] r41338 - in /trunk/python-bindings/src: Makefile.am YCPDeclarations.cc YCPDeclarations.h YCPDeclarations.py
by dfiser＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: dfiser Date: Wed Oct 10 16:52:28 2007 New Revision: 41338 URL: http://svn.opensuse.org/viewcvs/yast?rev=41338&view=rev Log: - Added YCPDeclarations tool, i.e. YCPDeclarations.py - python module, YCPDeclarations.h and .cc - c++ interface to access declarations declared using YCPDeclarations.py module. Added: trunk/python-bindings/src/YCPDeclarations.cc trunk/python-bindings/src/YCPDeclarations.h trunk/python-bindings/src/YCPDeclarations.py Modified: trunk/python-bindings/src/Makefile.am Modified: trunk/python-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/Makefile.am?… ============================================================================== --- trunk/python-bindings/src/Makefile.am (original) +++ trunk/python-bindings/src/Makefile.am Wed Oct 10 16:52:28 2007 @@ -5,15 +5,16 @@ AM_CXXFLAGS = -DY2LOG=\"Python\" -DMODULEDIR=\"$(moduledir)\" MY_PYTHON_VENDORARCH = $(subst /usr,$(prefix),$(PYTHON_VENDORARCH)) -pythonpydir = $(MY_PYTHON_VENDORARCH)/YaST +#pythonpydir = $(MY_PYTHON_VENDORARCH)/YaST +pythonpydir = $(MY_PYTHON_VENDORARCH)/site-packages pythonsodir = $(MY_PYTHON_VENDORARCH)/site-packages -#pythonpm_DATA = YCP.pm +pythonpy_DATA = YCPDeclarations.py # plugin, libtool forces 'lib' prefix plugin_LTLIBRARIES = libpy2lang_python.la -noinst_LTLIBRARIES = libYCPTypes.la liby2lang_python.la +noinst_LTLIBRARIES = libYCPTypes.la liby2lang_python.la libYCPDeclarations.la pythonso_LTLIBRARIES = libYCP.la libYCPTypes_la_SOURCES = YCPTypes.cc YCPTypes.h \ @@ -22,6 +23,8 @@ YCPTypes/Symbol.cc \ YCPTypes/Term.cc +libYCPDeclarations_la_SOURCES = YCPDeclarations.cc YCPDeclarations.h + # binary part of the python module libYCP_la_SOURCES = \ $(liby2lang_python_la_SOURCES) \ @@ -49,7 +52,7 @@ -ly2util \ -version-info 2:0 -libYCP_la_LIBADD = libYCPTypes.la +libYCP_la_LIBADD = libYCPTypes.la #libYCPDeclarations.la libpy2lang_python_la_LDFLAGS = -version-info 2:0 @@ -62,7 +65,7 @@ -L$(libdir) -L$(plugindir) \ -lycp -ly2 -ly2util -libpy2lang_python_la_LIBADD = libYCPTypes.la +libpy2lang_python_la_LIBADD = libYCPTypes.la libYCPDeclarations.la liby2lang_python_la_LIBADD = $(PYTHON_LDFLAGS) @@ -105,3 +108,5 @@ # nodist_module_DATA = YaPI.pm #EXTRA_DIST = $(pythonpy_DATA) $(module_DATA) +EXTRA_DIST = $(pythonpy_DATA) + Added: trunk/python-bindings/src/YCPDeclarations.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.cc (added) +++ trunk/python-bindings/src/YCPDeclarations.cc Wed Oct 10 16:52:28 2007 @@ -0,0 +1,219 @@ +#include "YCPDeclarations.h" +#include <iostream> +using std::string; +using std::vector; +//#define DBG(str) \ + std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ + std::cerr.flush() +#define DBG(str) + + +/********** STATIC MEMBERS **********/ +std::auto_ptr<YCPDeclarations> YCPDeclarations::_instance; +YCPDeclarations *YCPDeclarations::instance() +{ + if (_instance.get() == 0){ + _instance = std::auto_ptr<YCPDeclarations>(new YCPDeclarations()); + } + return _instance.get(); +} +/********** STATIC MEMBERS END **********/ + + + + +/********** PRIVATE **********/ +bool YCPDeclarations::_isInCache(PyFunctionObject *func) const +{ + int len = _cache.size(); + for (int i=0; i < len; i++){ + if (_cache[i]->function == func) + return true; + } + + return false; +} + +void YCPDeclarations::_cacheFunction(PyFunctionObject *func) +{ + PyObject *item; + PyObject *params; + PyObject *return_type; + PyObject *tmp; + cache_function_t *function; + Py_ssize_t tuple_size; + + DBG("Called _cacheFunction(" << (long)func << ")"); + + if (_isInCache(func)){ + DBG("YCPDeclarations::_cacheFunction(" << (long)func << ") - is in cache"); + return; + } + + item = _getItemFromFunctionMap((PyObject *)func); + if (item == NULL || !PyDict_Check(item)){ + DBG("YCPDeclarations::_cacheFunction(" << (long)func << ") - " << "error in item: " << (long)item); + return; + } + + return_type = PyDict_GetItemString(item, "return_type"); + if (return_type == NULL || !PyString_Check(return_type)){ + DBG("YCPDeclarations::_cacheFunction(" << (long)func << ") - " << "error in return_type: " << (long)return_type); + return; + } + params = PyDict_GetItemString(item, "parameters"); + if (params == NULL || !PyTuple_Check(params)){ + DBG("YCPDeclarations::_cacheFunction(" << (long)func << ") - " << "error in params: " << (long)params); + return; + } + + //allocate memory + function = new cache_function_t; + + //function + function->function = func; + + //return type: + function->return_type = _interpretType(PyString_AsString(return_type)); + + //parameters: + tuple_size = PyTuple_Size(params); + for (Py_ssize_t i=0; i < tuple_size; i++){ + tmp = PyTuple_GetItem(params, i); + function->parameters.push_back(_interpretType(PyString_AsString(tmp))); + } + + //add new function item + _cache.push_back(function); + DBG("_cacheFunction(" << (long)func << ") - _cache.size() : " << _cache.size()); +} + +const YCPDeclarations::cache_function_t *YCPDeclarations::_getCachedFunction(PyFunctionObject *func) const +{ + cache_function_t *ret = NULL; + int len = _cache.size(); + + DBG(""); + DBG("_getCachedFunction(" << (long)func << ") - " << "start searching"); + for (int i=0; i < len; i++){ + DBG("== " << "_cache[" << i << "]->function: " << (long)_cache[i]->function); + if (_cache[i]->function == func){ + ret = _cache[i]; + break; + } + } + + DBG("_getCachedFunction(" << (long)func << ") -> " << (long)ret); + DBG(""); + return ret; +} + + +PyObject *YCPDeclarations::_getItemFromFunctionMap(PyObject *key) +{ + PyObject *dict = PyModule_GetDict(_py_self); + PyObject *func_map = PyDict_GetItemString(dict, "_function_map"); + + if (!PyDict_Check(func_map)){ + return NULL; + } + DBG("_function_map : " << (long)func_map); + + return PyDict_GetItem(func_map, key); +} + + +constTypePtr YCPDeclarations::_interpretType(const char *c_type) const +{ + string type(c_type); + + if (type == "void") + return Type::Void; + if (type == "boolean") + return Type::Boolean; + if (type == "float") + return Type::Float; + if (type == "integer") + return Type::Integer; + if (type == "path") + return Type::Path; + if (type == "string") + return Type::String; + if (type == "symbol") + return Type::Symbol; + if (type == "term") + return Type::Term; + + // default: + return Type::Any; +} +/********** PRIVATE END **********/ + + + + +/********** PUBLIC **********/ + +YCPDeclarations::YCPDeclarations() +{ + DBG("YCPDeclarations - constructor"); + _py_self = PyImport_ImportModule("YCPDeclarations"); +} + +YCPDeclarations::~YCPDeclarations() +{ + DBG("YCPDeclarations - destructor"); + + int cache_len = _cache.size(); + for (int i=0; i < cache_len; i++){ + delete _cache[i]; + } + + if (_py_self != NULL) + Py_DECREF(_py_self); +} + + + +int YCPDeclarations::numParams(PyFunctionObject *func) +{ + _cacheFunction(func); + + const cache_function_t *function = _getCachedFunction(func); + if (function == NULL) + return -1; + + return function->parameters.size(); +} + +bool YCPDeclarations::exists(PyFunctionObject *func) +{ + _cacheFunction(func); + + return _isInCache(func); +} + +vector<constTypePtr> YCPDeclarations::params(PyFunctionObject *func) +{ + _cacheFunction(func); + + const cache_function_t *function = _getCachedFunction(func); + if (function == NULL){ + return vector<constTypePtr>(); + } + + return function->parameters; +} + +constTypePtr YCPDeclarations::returnType(PyFunctionObject *func) +{ + _cacheFunction(func); + + const cache_function_t *function = _getCachedFunction(func); + if (function == NULL){ + return _interpretType("any"); + } + + return function->return_type; +} +/********** PUBLIC END **********/ Added: trunk/python-bindings/src/YCPDeclarations.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.h (added) +++ trunk/python-bindings/src/YCPDeclarations.h Wed Oct 10 16:52:28 2007 @@ -0,0 +1,128 @@ +#ifndef _YCPDECLARATIONS_H_ +#define _YCPDECLARATIONS_H_ + +#include <Python.h> +#include <ycp/Type.h> +#include <vector> +#include <string> + +/** + * This class stores information about declarations in python module which were + * done by YCPDeclarations module (YCPDeclaratios.py). + * This is class is singelton and static method instance() returns pointer to + * object. + * + * All methods which return any information about declared functions are + * called with argument pointer to PyFunctionObject (which identifies + * function unambiguously. + * + * Example of usage: + * + * #include "YCPDeclarations.h" + * + * PyObject *func = PyDict_GetItemString(dict, "function"); + * YCPDeclarations *decl = YCPDeclarations::instance(); + * int num_params = decl->numParams((PyFunctionObject *)func); + * ... + * + */ +class YCPDeclarations { + private: + /** + * structure where can be stored cached function. + */ + typedef struct{ + PyFunctionObject *function; + constTypePtr return_type; + std::vector<constTypePtr> parameters; + } cache_function_t; + + + /** + * Pointer to Python module YCPDeclarations. + */ + PyObject *_py_self; + + /** + * List of cached functions. + */ + std::vector<cache_function_t *> _cache; + + + + /** + * Private construct. + * Call YCPDeclarations::instance() to get pointer to YCPDeclarations + * object. + */ + YCPDeclarations(); + + /** + * Return item from function map which has key key. + * Return borrowed reference! + */ + PyObject *_getItemFromFunctionMap(PyObject *key); + + /** + * Interpret string as YCP type. + * This method must be synchronized with variable + * YCPDeclare._available_types from YCPDeclarations.py!! + */ + constTypePtr _interpretType(const char *) const; + + /** + * Return true, if func is in internal cache. + */ + bool _isInCache(PyFunctionObject *func) const; + + /** + * Cache function func if it is not already cached. + */ + void _cacheFunction(PyFunctionObject *func); + + /** + * Return pointer to struct which defines cached function. + * Memory pointed by returned pointer must _not_ be deleted! It points + * into internal list. + */ + const cache_function_t *_getCachedFunction(PyFunctionObject *func) const; + + public: + ~YCPDeclarations(); + + /** + * Return number of parameters in declaration or -1 if function is not registered. + */ + int numParams(PyFunctionObject *pointer_to_function); + + /** + * Return true if function exists in YCPDeclarations module. + */ + bool exists(PyFunctionObject *pointer_to_function); + + /** + * Return list of YCP types corresponding with parameters fo function. + */ + std::vector<constTypePtr> params(PyFunctionObject *pointer_to_function); + + /** + * Return return YCP type of function. + */ + constTypePtr returnType(PyFunctionObject *pointer_to_function); + + + //static + private: + /** + * Here is stored pointer to YCPDeclare object. + */ + static std::auto_ptr<YCPDeclarations> _instance; + public: + /** + * Return pointer to instance of YCPDeclare object. + */ + static YCPDeclarations *instance(); +}; + +#endif +/* vim: set sw=4 ts=4 et ft=cpp cindent : */ Added: trunk/python-bindings/src/YCPDeclarations.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.py (added) +++ trunk/python-bindings/src/YCPDeclarations.py Wed Oct 10 16:52:28 2007 @@ -0,0 +1,102 @@ +""" + This module defines class YCPDeclare which can be used for defining + what return type and what types of arguments has function which will be + exported to YCP. For usage see YCPDeclare.__doc__. + + + Internal: + Important is variable _function_map which holds information about + functions. Contents of _function_map can be accessed from C: + + PyObject *import = PyImport_ImportModule("YCPDeclarations"); + PyObject *dict = PyModule_GetDict(import); + PyObject *func_map = PyDict_GetItemString(dict, "_function_map"); + // now in func_map should be stored map describing functions declared by + // YCPDeclare + + _function_map has form: + _function_map = { + pointer_to_function : { + "return_type" : "string", + "parameters" : [ list of strings representing types ] + } + } + +""" + +import inspect + +_function_map = {} +def _addToFunctionMap(func_pointer, return_type, params_types): + global __function_map + _function_map[func_pointer] = {"return_type" : return_type, + "parameters" : params_types} + +class YCPDeclare: + """ + Functor for definig return type and types of parameters + of function which will be exported into YCP. Best usage + is as decorator (see http://www.python.org/dev/peps/pep-0318) + + Example of usage: + form YCPDeclarations import YCPDeclare + + @YCPDeclare("string", "int", "int") + def function(i, ii): + \"\"\" Function which returns string a accept two + integers as arguments. \"\"\" + return str(i+ii) + """ + + # tuple of types which can be used + # This list must be synchronized with + # YCPDeclarations::_interpretType function from YCPDeclarations.h!! + _available_types = ( + "any", + "boolean", + "string", + "integer", + "term", + "symbol", + "path", + "float" + ) + + def __init__(self, return_type, *params_types): + self._return_type = "" + self._params = [] + + self._checkTypes((return_type,) + params_types) + + self._return_type = return_type + self._params = params_types + + def __call__(self, func): + """ Overridden operator() """ + + self._checkNumParams(func, len(self._params)) + + _addToFunctionMap(func, self._return_type, self._params) + return func + + + def _checkTypes(self, types): + """ Check if defined types are in _available_types """ + + _invalid_types = [] + for type in types: + if type not in self._available_types: + _invalid_types.append(type) + + if len(_invalid_types) != 0: + raise Exception("Unknnown types: " + str(_invalid_types)) + + + def _checkNumParams(self, func, numTypes): + """ Check if number of parameters equals to number of defined types """ + + args = len(inspect.getargspec(func)[0]) + if args != numTypes: + raise Exception("Number of declared types does not match number of arguments.") + + -- 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] r41337 - /branches/tmp/sh/mod-ui/core/libyui/src/YTree.h
by sh-sh-sh＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: sh-sh-sh Date: Wed Oct 10 16:47:02 2007 New Revision: 41337 URL: http://svn.opensuse.org/viewcvs/yast?rev=41337&view=rev Log: doc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTree.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTree.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTree.h Wed Oct 10 16:47:02 2007 @@ -26,6 +26,23 @@ class YTreePrivate; +/** + * Tree: List box that displays a (scrollable) list of hierarchical items from + * which the user can select exactly one. Each item has a label text and an + * optional icon (*). + * + * This is very similar to SelectionBox, but each item can have subitems that + * can be open (expanded) or closed (collapsed). + * + * The tree widget also has a caption label that is displayed above the + * tree. The hotkey displayed in that caption label will move the keyboard + * focus into the tree item list. + * + * + * (*) Not all UIs (in particular not text-based UIs) support displaying icons, + * so an icon should never be an exclusive means to display any kind of + * information. + **/ class YTree : public YSelectionWidget { protected: @@ -59,7 +76,7 @@ /** * Add multiple items. For some UIs, this can be more efficient than * calling addItem() multiple times. This function also automatically calls - * rebuildTree() at the end. + * rebuildTree() at the end. * * Derived classes can overwrite this function, but they should call this * base class function at the end of the new implementation. @@ -96,7 +113,7 @@ * Reimplemented from YWidget. **/ virtual const YPropertySet & propertySet(); - + /** * The name of the widget property that will return user input. * Inherited from YWidget. -- 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] r41336 - /tags/branch-SLE-10-SP1-2_13_53/country/
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 16:09:08 2007 New Revision: 41336 URL: http://svn.opensuse.org/viewcvs/yast?rev=41336&view=rev Log: Created tag branch-SLE-10-SP1-2_13_53 for country Added: tags/branch-SLE-10-SP1-2_13_53/country/ - copied from r41335, branches/SuSE-SLE-10-SP1-Branch/country/ -- 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] r41335 - /tags/branch-SLE-10-SP1-2_13_8/firstboot/
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 16:08:56 2007 New Revision: 41335 URL: http://svn.opensuse.org/viewcvs/yast?rev=41335&view=rev Log: Created tag branch-SLE-10-SP1-2_13_8 for firstboot Added: tags/branch-SLE-10-SP1-2_13_8/firstboot/ - copied from r41334, branches/SuSE-SLE-10-SP1-Branch/firstboot/ -- 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] r41334 - in /branches/SuSE-SLE-10-SP1-Branch/country: VERSION language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 16:08:50 2007 New Revision: 41334 URL: http://svn.opensuse.org/viewcvs/yast?rev=41334&view=rev Log: - in firstboot, do not show list with secondary languages (F302520) - 2.13.53 Modified: branches/SuSE-SLE-10-SP1-Branch/country/VERSION branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-SLE-10-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/countr… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/country/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/country/VERSION Wed Oct 10 16:08:50 2007 @@ -1 +1 @@ -2.13.52 +2.13.53 Modified: branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/countr… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp Wed Oct 10 16:08:50 2007 @@ -205,7 +205,7 @@ string preselected = Language::preselected; - if (Stage::initial () && preselected != "en_US" && set_default) + if (preselected != "en_US" && set_default) { if (ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog")) { @@ -243,7 +243,7 @@ // heading text string heading_text = _("Languages"); - if (Stage::initial () && set_default && !Mode::repair ()) + if (set_default && !Mode::repair ()) { // heading text heading_text = _("Language"); @@ -254,7 +254,7 @@ heading_text = _("Welcome to System Repair"); } - if (Stage::initial () && set_default) + if (set_default) { show_expert = false; more_languages = false; @@ -299,6 +299,15 @@ (language == codelist[1]:"")))) ); + // do not offer the dialog with native forms (fonts may not be installed) + if (Stage::firstboot ()) + languagesel = `SelectionBox (`id(`language), `opt(`notify), "", + maplist (string trans_lang, lsort (lang_list), { + string code = lang2code [trans_lang]:""; + return `item (`id (code), trans_lang, language == code); + }) + ); + // this type of contents will be shown only for initial installation dialog term contents = `HVCenter ( `BackgroundPixmap ("wallpapers/welcome.jpg"), @@ -472,9 +481,9 @@ UI::SetFocus(`id(`language)); // adapt keyboard for language? - boolean kbd_adapt = (Stage::initial () && set_default && !Mode::config ()); + boolean kbd_adapt = (set_default && !Mode::config ()); // adapt timezone for language? - boolean tmz_adapt = (Stage::initial () && set_default && !Mode::config ()); + boolean tmz_adapt = (set_default && !Mode::config ()); repeat @@ -547,7 +556,7 @@ } - if (Stage::initial () && set_default) + if (set_default) { Timezone::ResetZonemap (); } @@ -610,7 +619,7 @@ if (kbd_adapt) { Keyboard::SetKeyboardForLanguage (language); - if (Stage::initial () && set_default) + if (set_default) { Keyboard::SetKeyboardDefault(); } Modified: branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/countr… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes Wed Oct 10 16:08:50 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 23 14:51:46 CEST 2007 - jsuchome(a)suse.cz + +- in firstboot, do not show list with secondary languages (F302520) +- 2.13.53 + +------------------------------------------------------------------- Mon Apr 2 08:24:47 CEST 2007 - jsuchome(a)suse.cz - Arabic added again (#258795) -- 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] r41333 - in /branches/SuSE-SLE-10-SP1-Branch/firstboot: ./ package/ scripts/Firstboot-Stage/ src/ src/data/
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 16:08:44 2007 New Revision: 41333 URL: http://svn.opensuse.org/viewcvs/yast?rev=41333&view=rev Log: - added support for keyboard and restaring network (#F302520) - added one more client for showing the license + new value FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865) - restart kbd after yast is finished (#303808) - 2.13.8 Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp (with props) branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp (with props) branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp (with props) Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION Wed Oct 10 16:08:44 2007 @@ -1 +1 @@ -2.13.7 +2.13.8 Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes Wed Oct 10 16:08:44 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Aug 23 14:57:53 CEST 2007 - jsuchome(a)suse.cz + +- added support for keyboard and restaring network (#F302520) +- added one more client for showing the license + new value + FIRSTBOOT_NOVELL_LICENSE_DIR to /etc/sysconfig/firstboot (F302865) +- restart kbd after yast is finished (#303808) +- 2.13.8 + +------------------------------------------------------------------- Thu Mar 15 17:29:01 CET 2007 - jsuchome(a)suse.cz - unset LC_ALL before starting firstboot stage (#252780) Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/scripts/Firstboot-Stage/S05-cleanup Wed Oct 10 16:08:44 2007 @@ -42,4 +42,9 @@ rm -f $IFCFG_USB fi +if [ -e "/var/lib/YaST2/firstboot_kbd_restart" ] ; then + /etc/init.d/kbd restart + rm /var/lib/YaST2/firstboot_kbd_restart +fi + stop_unicode Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am Wed Oct 10 16:08:44 2007 @@ -11,7 +11,10 @@ firstboot_license.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ - firstboot.ycp + firstboot_keyboard.ycp \ + firstboot.ycp \ + firstboot_license_novell.ycp \ + firstboot_network_write.ycp ynclude_DATA = \ routines.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/data/sysconfig.firstboot Wed Oct 10 16:08:44 2007 @@ -24,11 +24,18 @@ ## Default: "" # # Directory from which 'license.txt' and 'license_<locale>.txt' are read +# This are vendor-specific license texts FIRSTBOOT_LICENSE_DIR="" ## Type: string ## Default: "" # +# Directory from which 'license.txt' and 'license_<locale>.txt' are read +FIRSTBOOT_NOVELL_LICENSE_DIR="" + +## Type: string +## Default: "" +# # finish text file FIRSTBOOT_FINISH_FILE="" Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_keyboard.ycp Wed Oct 10 16:08:44 2007 @@ -0,0 +1,34 @@ +/** + * File : firstboot_keyboard.ycp + * Author : Jiri Suchomel <jsuchome(a)suse.cz> + * Purpose : Firstboot configuratiuon of keyboard + * + * $Id$ + */ +{ + textdomain "country"; + + import "Arch"; + import "Directory"; + import "Keyboard"; + import "Firstboot"; + + include "keyboard/dialogs.ycp"; + + any ret = `auto; + if (Arch::s390 ()) + return ret; + + Keyboard::Read (); + + ret = KeyboardDialog ($[]); + + if (ret == `next) + { + Keyboard::Save (false); + // kbd must be restarted after YaST finishes (#303808) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir)); + } + + return ret; +} Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_language.ycp Wed Oct 10 16:08:44 2007 @@ -18,15 +18,16 @@ { textdomain "firstboot"; + import "Console"; import "Language"; import "Wizard"; import "Firstboot"; import "Popup"; - import "Label"; import "Encoding"; import "Mode"; import "GetInstArgs"; + import "ProductControl"; // Memozize the current language. // @@ -39,7 +40,9 @@ while (result == `again) { Wizard::SetDesktopIcon("language"); - result = WFM::CallFunction ("inst_language", [ GetInstArgs::argmap() ] ); + map args = GetInstArgs::argmap(); + args["first_run"] = "yes"; + result = WFM::CallFunction ("inst_language", [ args ] ); Wizard::RetranslateButtons (); } @@ -51,7 +54,6 @@ // y2milestone( "`cancel or `back --> restoring: <%1>", language_on_entry ); - import "Console"; import "Installation"; boolean use_utf8 = true; // utf8 is default @@ -82,10 +84,19 @@ { Firstboot::language_changed = true; Language::Save(); + Console::Save (); y2milestone( "Language changed --> saving" ); - - // popup text - Popup::Message( _("Your language setting has been changed. + boolean firstboot_keyboard = false; + foreach (map mod, ProductControl::getModules( "firstboot", Mode::mode (), `enabled), { + if (mod["name"]:"" == "firstboot_keyboard" && mod["enabled"]:false) + { + y2milestone ("keyboard will be configured -> no warning"); + firstboot_keyboard = true; + } + }); + if (!firstboot_keyboard) + // popup text + Popup::Message( _("Your language setting has been changed. If necessary, you may want to adapt your keyboard settings to the new language. This is possible either in the YaST2 Control Center or by Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_license_novell.ycp Wed Oct 10 16:08:44 2007 @@ -0,0 +1,35 @@ +/* + * Module : firstboot_license_novell.ycp + * Authors: Ladislav Slezak <lslezak(a)suse.cz>, Jiri Suchomel <jsuchome(a)suse.cz> + * Purpose: Display Novell license at the start of firstboot + * + * $Id:$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + args["directory"] = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, ""); + args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_network_write.ycp Wed Oct 10 16:08:44 2007 @@ -0,0 +1,16 @@ +/** + * File : firstboot_network_write.ycp + * Author : Jiri Suchomel <jsuchome(a)suse.cz> + * Purpose : Save network configuration + * (usable when network proposal was not run) + * $Id$ + */ +{ + // currently only restart the service, may be enhanced later + + import "Service"; + + Service::Restart ("network"); + + return `auto; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0