November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41706 - /trunk/restore/src/restore_bootloader.ycp
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 15:09:47 2007 New Revision: 41706 URL: http://svn.opensuse.org/viewcvs/yast?rev=41706&view=rev Log: Good point: "Import module before using it" :) Modified: trunk/restore/src/restore_bootloader.ycp Modified: trunk/restore/src/restore_bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/restore_bootloader.y… ============================================================================== --- trunk/restore/src/restore_bootloader.ycp (original) +++ trunk/restore/src/restore_bootloader.ycp Thu Nov 1 15:09:47 2007 @@ -13,6 +13,8 @@ { + import "Bootloader"; + boolean ret = nil; ret = Bootloader::Read(); -- 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] r41705 - in /trunk/python-bindings/src: Makefile.am YPython.cc YPython.h YPythonNamespace.cc
by juhliarik＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: juhliarik Date: Thu Nov 1 15:08:41 2007 New Revision: 41705 URL: http://svn.opensuse.org/viewcvs/yast?rev=41705&view=rev Log: solved problem with adding namespace Modified: trunk/python-bindings/src/Makefile.am trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPython.h trunk/python-bindings/src/YPythonNamespace.cc 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 Thu Nov 1 15:08:41 2007 @@ -52,8 +52,6 @@ -lycp -ly2 \ -Xlinker --no-whole-archive \ -ly2util \ - -ly2 \ - -lYCPDeclarations \ -version-info 2:0 libYCP_la_LIBADD = libYCPTypes.la #libYCPDeclarations.la Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Thu Nov 1 15:08:41 2007 @@ -603,6 +603,23 @@ return Term_NewString(ycp_Term->asTerm()->name().c_str(), value); } +/** + * init namespace + * @param char * name of module + * @param char * name of function + * @return namespace of YCP + */ + +static Y2Namespace * getNs (const char * ns_name, const char * func_name) { + Import import(ns_name); // has a static cache + Y2Namespace *ns = import.nameSpace(); + if (ns == NULL) { + y2error ("... for a Python call of %s", func_name); + } else { + ns->initialize (); + } + return ns; +} /** * Convert Python Function to YCPCode. @@ -612,57 +629,28 @@ **/ YCPValue YPython::fromPythonFunToReference (PyObject* pyFun) { - - FunctionTypePtr sym_tp = new FunctionType(Type::Any); - PyObject *fun_code = PyFunction_GetCode(pyFun); - char *fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); + PyObject *fun_code = PyFunction_GetCode(pyFun); + string fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); string file_path = PyString_AsString(((PyCodeObject *) fun_code)->co_filename); - - //printf ("meno funckie %s\n", fun_name); - //printf ("meno suboru %s\n", file_path.c_str()); + //found last "/" in path size_t found = file_path.find_last_of("/"); //extract module name from path string module_name = file_path.substr(found+1); - - file_path = YCPPathSearch::find (YCPPathSearch::Module, module_name); - - if (file_path.empty()) - file_path = YCPPathSearch::find (YCPPathSearch::Include, module_name); - - if (file_path.empty()) - file_path = YCPPathSearch::find (YCPPathSearch::Client, module_name); - - if (file_path.empty()) { - y2error("Finding file where is function %s failed", fun_name); - return YCPNull(); - } - - //found last "/" in path - found = file_path.find_last_of("/"); - - string path = file_path.substr(0,found+1); - - setenv("PYTHONPATH", path.c_str(), 1); - - YPython::loadModule (file_path); - - //extract module name from path - module_name = file_path.substr(found+1); - //delete last 3 chars from module name ".py" - module_name.erase(module_name.size()-3); //delete ".py" + module_name.erase(module_name.size()-3); + - //found last "/" in path - Y2Namespace *ns = new YPythonNamespace (module_name); + Y2Namespace *ns = getNs (module_name.c_str(),fun_name.c_str()); if (ns) { - TableEntry *sym_te = ns->table ()->find (fun_name); + cout <<"ns bolo najdene!!! "<< endl; + TableEntry *sym_te = ns->table ()->find (fun_name.c_str()); if (sym_te == NULL) { - y2error ("No such symbol %s::%s", module_name.c_str(), fun_name); + y2error ("No such symbol %s::%s", module_name.c_str(), fun_name.c_str()); return YCPNull(); } SymbolEntryPtr sym_entry = sym_te->sentry(); @@ -670,7 +658,7 @@ return YCPReference(sym_entry); } else { - y2error("Creating namespace for function %s failed", fun_name); + y2error("Creating namespace for function %s failed", fun_name.c_str()); return YCPNull(); } Modified: trunk/python-bindings/src/YPython.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.h?re… ============================================================================== --- trunk/python-bindings/src/YPython.h (original) +++ trunk/python-bindings/src/YPython.h Thu Nov 1 15:08:41 2007 @@ -70,14 +70,14 @@ **/ static YPython * yPython(); - /** + /** * Access the static _pMainDicts * **/ PyObject* pMainDicts(); - /** + /** * static _pMainDicts includes dictionaries of all imported python modules * **/ Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Thu Nov 1 15:08:41 2007 @@ -154,7 +154,7 @@ PyObject * fun_code; //code of function //Declarations (using YPCDelcarations python module) - YCPDeclarations *decl = YCPDeclarations::instance(); + //YCPDeclarations *decl = YCPDeclarations::instance(); //YCPDeclarations *decl = new YCPDeclarations(); FunctionTypePtr sym_tp; @@ -192,7 +192,7 @@ fun_code = PyFunction_GetCode(pFunc); num = ((PyCodeObject *) fun_code)->co_argcount; - + /* if (decl->exists((PyFunctionObject *)pFunc) && decl->numParams((PyFunctionObject *)pFunc) == num){ @@ -203,14 +203,14 @@ for (int i=0; i < tmp; i++){ sym_tp->concat(list_of_types[i]); } - }else{ + }else{*/ sym_tp = new FunctionType(Type::Any); //y2milestone ("Number of parameters: %d", num); //add types and number of arguments into SymbolEntry table for (long j = 0; j < num; j++) { sym_tp->concat(Type::Any); } - } + //} //y2milestone ("Callable function %s", PyString_AsString(item)); // symbol entry for the function SymbolEntry *fun_se = new SymbolEntry ( -- 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] r41704 - /trunk/restore/src/Makefile.am
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 14:59:02 2007 New Revision: 41704 URL: http://svn.opensuse.org/viewcvs/yast?rev=41704&view=rev Log: Modified makefile to install the new file Modified: trunk/restore/src/Makefile.am Modified: trunk/restore/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Makefile.am?rev=4170… ============================================================================== --- trunk/restore/src/Makefile.am (original) +++ trunk/restore/src/Makefile.am Thu Nov 1 14:59:02 2007 @@ -8,7 +8,8 @@ client_DATA = \ restore.ycp \ - restore_auto.ycp + restore_auto.ycp \ + restore_bootloader.ycp ynclude_DATA = \ helps.ycp \ -- 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] r41703 - in /trunk/restore: VERSION package/yast2-restore.changes src/Restore.ycp src/restore_bootloader.ycp yast2-restore.spec.in
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 14:56:53 2007 New Revision: 41703 URL: http://svn.opensuse.org/viewcvs/yast?rev=41703&view=rev Log: - All Bootloader function calls were moved to a separate YCP client restore_bootloader to break the build-dependency on yast2-bootloader. - 2.16.0 Added: trunk/restore/src/restore_bootloader.ycp Modified: trunk/restore/VERSION trunk/restore/package/yast2-restore.changes trunk/restore/src/Restore.ycp trunk/restore/yast2-restore.spec.in Modified: trunk/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/VERSION?rev=41703&r1=417… ============================================================================== --- trunk/restore/VERSION (original) +++ trunk/restore/VERSION Thu Nov 1 14:56:53 2007 @@ -1 +1 @@ -2.15.4 +2.16.0 Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Thu Nov 1 14:56:53 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Nov 1 11:03:06 CET 2007 - locilka(a)suse.cz + +- All Bootloader function calls were moved to a separate YCP client + restore_bootloader to break the build-dependency on + yast2-bootloader. +- 2.16.0 + +------------------------------------------------------------------- Wed Aug 29 17:29:38 CEST 2007 - locilka(a)suse.cz - Fixed evaluation of 'nil' value that prevented the restore from Modified: trunk/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Restore.ycp?rev=4170… ============================================================================== --- trunk/restore/src/Restore.ycp (original) +++ trunk/restore/src/Restore.ycp Thu Nov 1 14:56:53 2007 @@ -26,7 +26,6 @@ import "Report"; import "Mode"; import "Summary"; - import "Bootloader"; import "Service"; import "Package"; import "Label"; @@ -1257,24 +1256,9 @@ { y2milestone("activating boot loader configuration"); - // read actual boot loader configuration - ret = Bootloader::Read(); - - if (ret == false) - { - y2error("Boot loader read failed"); - } - else - { - // write configuration - force re-installation of boot loader - Bootloader::SetWriteMode( $["save_all" : true] ); - ret = Bootloader::Write(); - - if (ret == false) - { - y2error("Boot loader write failed"); - } - } + // Bootloader function calls were moved to a client + // to break the build-dependency on yast2-bootloader + ret = (boolean) WFM::call ("restore_bootloader"); if (ret == false) { Added: trunk/restore/src/restore_bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/restore_bootloader.y… ============================================================================== --- trunk/restore/src/restore_bootloader.ycp (added) +++ trunk/restore/src/restore_bootloader.ycp Thu Nov 1 14:56:53 2007 @@ -0,0 +1,33 @@ +/** + * File: clients/restore_bootloader.ycp + * Package: Restore module + * Summary: Special client for restoring bootloader settings + * Authors: Ladislav Slezak <lslezak(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> + * + * $Id:$ + * + * All bootloader calls were moved here to break building dependency + * on yast2-bootloader + */ + + +{ + boolean ret = nil; + + ret = Bootloader::Read(); + + if (ret == false) { + y2error("Boot loader read failed"); + } else { + // write configuration - force re-installation of boot loader + Bootloader::SetWriteMode( $["save_all" : true] ); + ret = Bootloader::Write(); + + if (ret == false) { + y2error("Boot loader write failed"); + } + } + + return ret; +} Modified: trunk/restore/yast2-restore.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/yast2-restore.spec.in?re… ============================================================================== --- trunk/restore/yast2-restore.spec.in (original) +++ trunk/restore/yast2-restore.spec.in Thu Nov 1 14:56:53 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: yast2-bootloader perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: aaa_base Requires: bzip2 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0