October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41242 - in /trunk/packager: package/yast2-packager.changes src/clients/pkg_finish.ycp
by locilka＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: locilka Date: Wed Oct 3 17:47:40 2007 New Revision: 41242 URL: http://svn.opensuse.org/viewcvs/yast?rev=41242&view=rev Log: - During upgrade, old repositories are removed (they are already readded either enabled or disabled during the initial stage of the upgrade). - Before removing, repositories are backed up in /var/lib/YaST2/repos.d_backup directory (both #326325). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/pkg_finish.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Oct 3 17:47:40 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Oct 3 17:42:05 CEST 2007 - locilka(a)suse.cz + +- During upgrade, old repositories are removed (they are already + readded either enabled or disabled during the initial stage + of the upgrade). +- Before removing, repositories are backed up in + /var/lib/YaST2/repos.d_backup directory (both #326325). + +------------------------------------------------------------------- Thu Sep 27 16:20:59 CEST 2007 - lslezak(a)suse.cz - fixed a wrong wording in the mediacheck help text (#304677) Modified: trunk/packager/src/clients/pkg_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/pkg_finish.… ============================================================================== --- trunk/packager/src/clients/pkg_finish.ycp (original) +++ trunk/packager/src/clients/pkg_finish.ycp Wed Oct 3 17:47:40 2007 @@ -17,12 +17,71 @@ textdomain "packager"; import "Installation"; +import "Mode"; +import "Stage"; import "String"; +import "FileUtils"; any ret = nil; string func = ""; map param = $[]; +// During upgrade, old sources are reinitialized +// either as enabled or disabled. +// The old sources from targed should go away. +void BackUpAllTargetSources () { + import "Directory"; + + string repos_dir = "/etc/zypp/repos.d"; + + if (! FileUtils::Exists (repos_dir)) { + y2error ("Directory %1 doesn't exist!", repos_dir); + return; + } + + list <string> current_repos = (list<string>) SCR::Read (.target.dir, repos_dir); + + if (current_repos == nil || size (current_repos) == 0) { + y2warning ("There are currently no repos in %1 conf dir", repos_dir); + return; + } else { + y2milestone ("These repos currently exist on a target: %1", current_repos); + } + + map cmd = (map) WFM::Execute (.local.bash_output, "date +%Y%m%d-%H%M%S"); + list <string> a_name_list = splitstring(cmd["stdout"]:"the_latest", "\n"); + string archive_name = "repos_" + a_name_list[0]:"" + ".tgz"; + + string shellcommand = sformat ( + "mkdir -p '%1' && cd '%1' && /bin/tar -czf '%2' '%3'", + String::Quote (Directory::vardir + "/repos.d_backup/"), + String::Quote (archive_name), + String::Quote (repos_dir) + ); + cmd = (map) SCR::Execute (.target.bash_output, shellcommand); + + if (cmd["exit"]:-1 != 0) { + y2error ("Unable to backup current repos; Command >%1< returned: %2", + shellcommand, cmd + ); + } + + boolean success = nil; + + foreach (string one_repo, current_repos, { + one_repo = repos_dir + "/" + one_repo; + y2milestone ("Removing target repository %1", one_repo); + success = (boolean) SCR::Execute (.target.remove, one_repo); + + if (success != true) { + y2error ("Cannot remove %1 file", one_repo); + } + }); + + y2milestone ("All old repositories were removed from the target"); + +} + /* Check arguments */ if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { func = (string)WFM::Args(0); @@ -47,6 +106,11 @@ { Pkg::SourceCacheCopyTo (Installation::destdir); + // Remove (backup) all sources not used during the update + if (Stage::initial() && Mode::update()) { + BackUpAllTargetSources(); + } + // disable all repositories and finish target Pkg::SourceFinishAll (); Pkg::TargetFinish(); -- 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] r41241 - in /trunk/gtk: ChangeLog package/yast2-gtk.changes src/YGPackageSelector.cc
by michael_meeks＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: michael_meeks Date: Wed Oct 3 17:40:12 2007 New Revision: 41241 URL: http://svn.opensuse.org/viewcvs/yast?rev=41241&view=rev Log: 2007-10-03 Michael Meeks <michael.meeks(a)novell.com> * src/YGPackageSelector.cc: don't re-render the progress bar so much when building the package tree: ~20% speedup. Modified: trunk/gtk/ChangeLog trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41241&r1=41240… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Oct 3 17:40:12 2007 @@ -1,5 +1,8 @@ 2007-10-03 Michael Meeks <michael.meeks(a)novell.com> + * src/YGPackageSelector.cc: don't re-render the progress bar + so much when building the package tree: ~20% speedup. + * src/YGPackageSelector.cc (PackageSelector): turn off searching description, too slow. (fastGetSummary): implement cache for summaries - hugely Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Wed Oct 3 17:40:12 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 6 15:32:01 BST 2007 - mmichael(a)suse.de + +- n#300750: big speedup wrt. search / sort + +------------------------------------------------------------------- Wed Aug 26 15:32:01 BST 2007 - mmichael(a)suse.de - n#300390: warn if cancelling a non-submitted transaction. 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 3 17:40:12 2007 @@ -1365,7 +1365,7 @@ GtkTreeModel *model = GTK_TREE_MODEL (store); g_object_set_data (G_OBJECT (model), "detail-package", GINT_TO_POINTER (1)); - SET_PROGRESS (zyppPool().size <zypp::Package>(), 10) + SET_PROGRESS (zyppPool().size <zypp::Package>(), 50) GtkTreeIter iter; for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Package>(); it != zyppPool().byKindEnd <zypp::Package>(); it++) @@ -1389,7 +1389,7 @@ // we need to create the categories tree as we iterate packages map <string, GtkTreePath *> tree; - SET_PROGRESS (zyppPool().size <zypp::Package>(), 5) + SET_PROGRESS (zyppPool().size <zypp::Package>(), 50) GtkTreeIter iter, parent_iter; for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Package>(); it != zyppPool().byKindEnd <zypp::Package>(); it++) @@ -1465,7 +1465,7 @@ // we need to create a categories tree for the patterns map <string, GtkTreeIter> tree; - SET_PROGRESS (zyppPool().size <zypp::Pattern>(), 1) + SET_PROGRESS (zyppPool().size <zypp::Pattern>(), 5) for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Pattern>(); it != zyppPool().byKindEnd <zypp::Pattern>(); it++) { ZyppSelectable selectable = *it; @@ -1522,7 +1522,7 @@ GtkTreeModel *model = GTK_TREE_MODEL (store); g_object_set_data (G_OBJECT (model), "detail-package", GINT_TO_POINTER (0)); - SET_PROGRESS (zyppPool().size <zypp::Language>(), 2) + SET_PROGRESS (zyppPool().size <zypp::Language>(), 20) for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Language>(); it != zyppPool().byKindEnd <zypp::Language>(); it++) { ZyppSelectable langsel = *it; -- 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] r41240 - /tags/stable-2_16_0/perl-bindings/
by mvidner＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: mvidner Date: Wed Oct 3 17:02:53 2007 New Revision: 41240 URL: http://svn.opensuse.org/viewcvs/yast?rev=41240&view=rev Log: Created tag stable-2_16_0 for perl-bindings Added: tags/stable-2_16_0/perl-bindings/ - copied from r41239, trunk/perl-bindings/ -- 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] r41239 - /trunk/perl-bindings/src/YPerl.cc
by mvidner＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: mvidner Date: Wed Oct 3 16:56:54 2007 New Revision: 41239 URL: http://svn.opensuse.org/viewcvs/yast?rev=41239&view=rev Log: fixed a warning Modified: trunk/perl-bindings/src/YPerl.cc Modified: trunk/perl-bindings/src/YPerl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/src/YPerl.cc?rev=4… ============================================================================== --- trunk/perl-bindings/src/YPerl.cc (original) +++ trunk/perl-bindings/src/YPerl.cc Wed Oct 3 16:56:54 2007 @@ -559,7 +559,7 @@ { EMBEDDED_PERL_DEFS; - static char *svtypes[] = { + static const char *svtypes[] = { "NULL", "IV", "NV", -- 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] r41238 - in /trunk/perl-bindings: VERSION package/yast2-perl-bindings.changes src/YPerl.cc
by mvidner＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: mvidner Date: Wed Oct 3 16:37:57 2007 New Revision: 41238 URL: http://svn.opensuse.org/viewcvs/yast?rev=41238&view=rev Log: Fixed compilation errors with GCC 4.3 by adding missing includes. Modified: trunk/perl-bindings/VERSION trunk/perl-bindings/package/yast2-perl-bindings.changes trunk/perl-bindings/src/YPerl.cc Modified: trunk/perl-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/VERSION?rev=41238&… ============================================================================== --- trunk/perl-bindings/VERSION (original) +++ trunk/perl-bindings/VERSION Wed Oct 3 16:37:57 2007 @@ -1 +1 @@ -2.15.3 +2.16.0 Modified: trunk/perl-bindings/package/yast2-perl-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/package/yast2-perl… ============================================================================== --- trunk/perl-bindings/package/yast2-perl-bindings.changes (original) +++ trunk/perl-bindings/package/yast2-perl-bindings.changes Wed Oct 3 16:37:57 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 3 16:37:46 CEST 2007 - mvidner(a)suse.cz + +- Fixed compilation errors with GCC 4.3 by adding missing includes. +- 2.16.0 + +------------------------------------------------------------------- Wed Aug 15 18:36:43 CEST 2007 - mvidner(a)suse.cz - UI from Perl: added examples and helper functions (F#120292). Modified: trunk/perl-bindings/src/YPerl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/src/YPerl.cc?rev=4… ============================================================================== --- trunk/perl-bindings/src/YPerl.cc (original) +++ trunk/perl-bindings/src/YPerl.cc Wed Oct 3 16:37:57 2007 @@ -25,6 +25,7 @@ #include <iosfwd> #include <sstream> #include <iomanip> +#include <limits> // Perl stuff #define PERL_NO_GET_CONTEXT /* we want efficiency, man perlguts */ -- 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] r41237 - /trunk/python-bindings/src/Y2PythonComponent.cc
by juhliarik＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: juhliarik Date: Wed Oct 3 16:20:19 2007 New Revision: 41237 URL: http://svn.opensuse.org/viewcvs/yast?rev=41237&view=rev Log: added comments Modified: trunk/python-bindings/src/Y2PythonComponent.cc Modified: trunk/python-bindings/src/Y2PythonComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/Y2PythonComp… ============================================================================== --- trunk/python-bindings/src/Y2PythonComponent.cc (original) +++ trunk/python-bindings/src/Y2PythonComponent.cc Wed Oct 3 16:20:19 2007 @@ -60,7 +60,8 @@ y2internal ("Couldn't find %s after Y2CCPython pointed to us", name); return NULL; } - + + //import module and add his dictionary to YPython::_pMainDicts YPython::loadModule (module); // introspect, create data structures for the interpreter -- 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] r41236 - /trunk/python-bindings/src/YPython.cc
by juhliarik＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: juhliarik Date: Wed Oct 3 16:19:26 2007 New Revision: 41236 URL: http://svn.opensuse.org/viewcvs/yast?rev=41236&view=rev Log: added comments Modified: trunk/python-bindings/src/YPython.cc 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 Wed Oct 3 16:19:26 2007 @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | | \ V / _` \___ \ | | __) | | | | | (_| |___) || | / __/ | | |_|\__,_|____/ |_| |_____| | @@ -64,6 +64,10 @@ YPython::~YPython(){} +/** + * return static _yPython + **/ + YPython * YPython::yPython() { @@ -73,6 +77,9 @@ return _yPython; } +/** + * return static _pMainDicts + **/ PyObject* YPython::pMainDicts() @@ -81,6 +88,9 @@ return _pMainDicts; } +/** + * "static" destructor + **/ YCPValue @@ -100,7 +110,7 @@ /** * Loads a module. - */ + **/ YCPValue YPython::loadModule(string module) { @@ -125,10 +135,9 @@ YPython::_pMainDicts = PyDict_New(); } - - + //create python string for name of module pModuleName = PyString_FromString(module_name.c_str()); - + //check if dictionary contain "dictionary" for module if ( PyDict_Contains(YPython::_pMainDicts, pModuleName) == 0) { pMain = PyImport_ImportModule(module_name.c_str()); int ret = PyDict_SetItem(YPython::_pMainDicts, pModuleName, PyModule_GetDict(pMain)); @@ -151,18 +160,20 @@ * @param bool is it method? TODO !! * @param YCPList argumnets from YCP to python function(0 - dummy) * @return YCPValue return value from python's function - */ + **/ YCPValue YPython::callInner (string module, string function, bool method, YCPList argList) { - PyObject* pMainDict; - PyObject* pFunc; - PyObject* pArgs; - PyObject* pReturn; + PyObject* pMainDict; // dictionary of module + PyObject* pFunc; // function from dictionary + PyObject* pArgs; // tuple object of argument for function + PyObject* pReturn; // return value from python YCPValue result = YCPNull (); + //obtain correct dictionary for module pMainDict = PyDict_GetItemString(YPython::yPython()->pMainDicts(),module.c_str()); + //obtain function from dictionary pFunc = PyDict_GetItemString(pMainDict, function.c_str()); pArgs = PyTuple_New(argList->size()-1); @@ -173,15 +184,16 @@ pArg = YCPTypeToPythonType(argList->value(i)); PyTuple_SetItem(pArgs,i-1, pArg); } - + //calling function from python pReturn = PyObject_CallObject(pFunc, pArgs); - + //delete arguments Py_CLEAR(pArgs); - + //convert python value to YCPValue if (pReturn) result = PythonTypeToYCPType(pReturn); // create YCP value else y2error("pReturn == 0"); + //delete pReturn Py_CLEAR(pReturn); if (result.isNull ()) { @@ -193,6 +205,12 @@ } +/** + * convert python value to YCPValue + * @param pythonValue + * @return YCPValue covnerted value from pythonValue + **/ + YCPValue YPython::PythonTypeToYCPType(PyObject *pythonValue) { // null (in python None) @@ -250,7 +268,11 @@ return YCPNull(); } - +/** + * convert YCPValue to python value + * @param YCPValue + * @return pythonValue covnerted value from YCPValue + **/ PyObject *YPython::YCPTypeToPythonType(YCPValue value) { @@ -311,7 +333,9 @@ /** * Convert a Python list to a YCPList. -**/ + * @param PyObject (python list) + * @return YCPList covnerted value from pythonValue + **/ YCPList YPython::fromPythonListToYCPList (PyObject* pPythonList) { YCPList ycp_List; PyObject * pItem; @@ -340,6 +364,8 @@ /** * Convert a Python Tuple to a YCPList. + * @param PyObject (python tuple) + * @return YCPList covnerted value from pythonValue **/ YCPList YPython::fromPythonTupleToYCPList (PyObject* pPythonTuple) { YCPList ycp_List; @@ -369,6 +395,8 @@ /** * Convert a YCPList to a Python list. + * @param YCPValue (list) + * @return PyObject (python list) covnerted value from YCPValue **/ PyObject* YPython::fromYCPListToPythonList (YCPValue ycp_List) { PyObject* pPythonList; @@ -397,6 +425,8 @@ /** * Convert a YCPList to a Python tuple. + * @param YCPValue (list) + * @return PyObject (python tuple) covnerted value from YCPValue **/ PyObject* YPython::fromYCPListToPythonTuple (YCPValue ycp_List) { PyObject* pPythonTuple; @@ -427,6 +457,8 @@ /** * Convert a YCPMap to a Python Dictionary. * If something goes wrong, iteration is trying proceed... + * @param YCPValue (map) + * @return PyObject (python dictionary) covnerted value from YCPValue **/ PyObject* YPython::fromYCPMapToPythonDict (YCPValue ycp_Map) { PyObject* pPythonDict; @@ -462,6 +494,8 @@ /** * Convert a Python Dictionary to a YCPMap. + * @param PyObject (python dictionary) + * @return YCPMap covnerted value from PyObject **/ YCPMap YPython::fromPythonDictToYCPMap (PyObject* pPythonDict) { YCPValue ycp_key; @@ -493,6 +527,8 @@ /** * Convert a Python Term to a YCPTerm. * Argument should be Term! + * @param PyObject (python Term) + * @return YCPTerm covnerted value from PyObject **/ YCPTerm YPython::fromPythonTermToYCPTerm (PyObject* pythonTerm) { PyObject *value; @@ -518,6 +554,8 @@ /** * Convert a YCPTerm to a Python Term. * Given argument should be term! + * @param YCPValue (Term) + * @return PyObject (python dictionary) covnerted value from YCPValue **/ PyObject* YPython::fromYCPTermToPythonTerm (YCPValue ycp_Term) { PyObject *value; -- 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] r41235 - in /trunk/python-bindings/src/YCPTypes: Term.cc YCPTypesInternal.cc
by dfiser＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: dfiser Date: Wed Oct 3 15:53:21 2007 New Revision: 41235 URL: http://svn.opensuse.org/viewcvs/yast?rev=41235&view=rev Log: - Fixed hash functions for YCP Types. Modified: trunk/python-bindings/src/YCPTypes/Term.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc Modified: trunk/python-bindings/src/YCPTypes/Term.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Ter… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Term.cc (original) +++ trunk/python-bindings/src/YCPTypes/Term.cc Wed Oct 3 15:53:21 2007 @@ -85,7 +85,7 @@ */ static long Term_hash(Term *self) { - if (self->hash != -1){ + if (self->hash == -1){ self->hash = PyObject_Hash(self->name) + PyObject_Hash(self->value); } return self->hash; Modified: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc (original) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc Wed Oct 3 15:53:21 2007 @@ -45,7 +45,7 @@ long YCPTypeString_hash(YCPTypeString *self) { - if (self->hash != -1){ + if (self->hash == -1){ self->hash = PyObject_Hash(self->value); } return self->hash; -- 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] r41234 - /trunk/python-bindings/src/YPython.cc
by juhliarik＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: juhliarik Date: Wed Oct 3 15:37:10 2007 New Revision: 41234 URL: http://svn.opensuse.org/viewcvs/yast?rev=41234&view=rev Log: added check for existing importing module in global dictionary Modified: trunk/python-bindings/src/YPython.cc 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 Wed Oct 3 15:37:10 2007 @@ -81,17 +81,6 @@ return _pMainDicts; } -bool -AddNewDict(string name, PyObject* dict) -{ - int ret = PyDict_SetItem(YPython::_pMainDicts, PyString_FromString(name.c_str()), dict); - if (ret == 0) - return true; - else - return false; -} - - YCPValue @@ -117,6 +106,7 @@ { string path; string module_name; + PyObject* pModuleName; size_t found; PyObject* pMain; @@ -135,13 +125,20 @@ YPython::_pMainDicts = PyDict_New(); } - //YPython::_pMain = PyImport_ImportModule(module_name.c_str()); - //new style - pMain = PyImport_ImportModule(module_name.c_str()); - PyDict_SetItem(YPython::_pMainDicts, PyString_FromString(module_name.c_str()), PyModule_GetDict(pMain)); - //YPython::yPython()->AddNewDict(module_name, PyModule_GetDict(pMain)); + pModuleName = PyString_FromString(module_name.c_str()); + + if ( PyDict_Contains(YPython::_pMainDicts, pModuleName) == 0) { + pMain = PyImport_ImportModule(module_name.c_str()); + int ret = PyDict_SetItem(YPython::_pMainDicts, pModuleName, PyModule_GetDict(pMain)); + if (ret != 0) + return YCPError("The module was not imported"); + } else { + + return YCPError("The module is imported"); + } + return YCPVoid(); -- 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] r41233 - in /trunk/python-bindings/src: YPython.cc YPythonNamespace.cc
by juhliarik＠svn.opensuse.org 03 Oct '07

03 Oct '07

Author: juhliarik Date: Wed Oct 3 15:06:07 2007 New Revision: 41233 URL: http://svn.opensuse.org/viewcvs/yast?rev=41233&view=rev Log: reimplementation import process Modified: trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPythonNamespace.cc 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 Wed Oct 3 15:06:07 2007 @@ -56,7 +56,7 @@ YPython * YPython::_yPython = 0; -PyObject * YPython::_pMain = NULL; +PyObject * YPython::_pMainDicts = NULL; YPython::YPython(){} @@ -75,13 +75,25 @@ PyObject* -YPython::pMain() +YPython::pMainDicts() { - return _pMain; + return _pMainDicts; +} + +bool +AddNewDict(string name, PyObject* dict) +{ + int ret = PyDict_SetItem(YPython::_pMainDicts, PyString_FromString(name.c_str()), dict); + if (ret == 0) + return true; + else + return false; } + + YCPValue YPython::destroy() { @@ -106,6 +118,7 @@ string path; string module_name; size_t found; + PyObject* pMain; //found last "/" in path found = module.find_last_of("/"); @@ -119,12 +132,19 @@ if (!Py_IsInitialized()) { setenv("PYTHONPATH", path.c_str(), 1); Py_Initialize(); - + YPython::_pMainDicts = PyDict_New(); } - YPython::_pMain = PyImport_ImportModule(module_name.c_str()); + //YPython::_pMain = PyImport_ImportModule(module_name.c_str()); + + //new style + + pMain = PyImport_ImportModule(module_name.c_str()); + PyDict_SetItem(YPython::_pMainDicts, PyString_FromString(module_name.c_str()), PyModule_GetDict(pMain)); + //YPython::yPython()->AddNewDict(module_name, PyModule_GetDict(pMain)); return YCPVoid(); + } /** @@ -139,16 +159,13 @@ YPython::callInner (string module, string function, bool method, YCPList argList) { - PyObject* pMain; PyObject* pMainDict; PyObject* pFunc; PyObject* pArgs; PyObject* pReturn; YCPValue result = YCPNull (); - - //pMain = PyImport_AddModule("__main__"); - pMainDict = PyModule_GetDict(YPython::_pMain); + pMainDict = PyDict_GetItemString(YPython::yPython()->pMainDicts(),module.c_str()); pFunc = PyDict_GetItemString(pMainDict, function.c_str()); pArgs = PyTuple_New(argList->size()-1); 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 Wed Oct 3 15:06:07 2007 @@ -154,7 +154,8 @@ long num = 0; //number of function arguments //obtain main dictionary of globals variables - pMainDict = PyModule_GetDict(YPython::yPython()->pMain()); + pMainDict = PyDict_GetItemString(YPython::yPython()->pMainDicts(),name.c_str()); + //keys from dictionary fun_names = PyDict_Keys(pMainDict); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0