Author: lslezak Date: Mon Jul 9 09:39:31 2007 New Revision: 39237 URL: http://svn.opensuse.org/viewcvs/yast?rev=39237&view=rev Log: - fixed compilation problems, removed _broken_sources (not needed anymore) Modified: branches/REFACTORING-10_3/pkg-bindings/src/Callbacks.cc branches/REFACTORING-10_3/pkg-bindings/src/Package.cc branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.cc branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h branches/REFACTORING-10_3/pkg-bindings/src/Resolvable.cc branches/REFACTORING-10_3/pkg-bindings/src/Target.cc Modified: branches/REFACTORING-10_3/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/Callbacks.cc?rev=39237&r1=39236&r2=39237&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/Callbacks.cc (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/Callbacks.cc Mon Jul 9 09:39:31 2007 @@ -276,7 +276,7 @@ CB callback( ycpcb( YCPCallbacks::CB_StartPackage ) ); if (callback._set) { - callback.addStr(res->location()); + callback.addStr(res->location().filename()); callback.addStr(res->summary()); callback.addInt(res->size()); callback.addBool(false); // is_delete = false (package installation) Modified: branches/REFACTORING-10_3/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/Package.cc?rev=39237&r1=39236&r2=39237&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/Package.cc (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/Package.cc Mon Jul 9 09:39:31 2007 @@ -992,8 +992,8 @@ } data->add( YCPString("status"), YCPSymbol(status)); - data->add( YCPString("location"), YCPString( pkg->location().basename() ) ); - data->add( YCPString("path"), YCPString( pkg->location().asString() ) ); + data->add( YCPString("location"), YCPString( pkg->location().filename().basename() ) ); + data->add( YCPString("path"), YCPString( pkg->location().filename().asString() ) ); return data; } @@ -1080,8 +1080,8 @@ YCPMap data; if (item) { - return (full_path) ? YCPString( pkg->location().asString() ) - : YCPString( pkg->location().basename() ); + return (full_path) ? YCPString( pkg->location().filename().asString() ) + : YCPString( pkg->location().filename().basename() ); } } catch (...) Modified: branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.cc?rev=39237&r1=39236&r2=39237&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.cc (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.cc Mon Jul 9 09:39:31 2007 @@ -34,7 +34,6 @@ #include #include -#include #include #include @@ -564,21 +563,13 @@ /** * @builtin Init - * @short completely initialize package management, throw away the current status + * @short completely initialize package management (currently it is empty) * @return boolean true on success */ YCPValue PkgModuleFunctions::Init () { - try { - zypp::SourceManager::sourceManager()->reset(); - } - catch( const zypp::Exception & expt ) - { - y2error( "Initialization of libzypp failed" ); - return YCPBoolean(false); - } - +#warning FIXME can be Init() empty?? return YCPBoolean(true); } Modified: branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h?rev=39237&r1=39236&r2=39237&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h Mon Jul 9 09:39:31 2007 @@ -80,8 +80,6 @@ zypp::Pathname _target_root; - std::setstd::string _broken_sources; - zypp::ZYpp::Ptr zypp_pointer; // remember the main locale (set by SetLocale) for SetAdditionalLocales, Modified: branches/REFACTORING-10_3/pkg-bindings/src/Resolvable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/Resolvable.cc?rev=39237&r1=39236&r2=39237&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/Resolvable.cc (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/Resolvable.cc Mon Jul 9 09:39:31 2007 @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -359,8 +358,6 @@ return ret; } - std::listzypp::SourceManager::SourceId source_ids = zypp::SourceManager::sourceManager()->enabledSources(); - try { for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(kind); Modified: branches/REFACTORING-10_3/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/Target.cc?rev=39237&r1=39236&r2=39237&view=diff ============================================================================== --- branches/REFACTORING-10_3/pkg-bindings/src/Target.cc (original) +++ branches/REFACTORING-10_3/pkg-bindings/src/Target.cc Mon Jul 9 09:39:31 2007 @@ -71,10 +71,6 @@ _target_root = zypp::Pathname(root->value()); - // we have moved to a different target, the broken source information - // is no longer valid - _broken_sources.clear(); - return YCPBoolean(true); } @@ -103,10 +99,6 @@ _target_root = zypp::Pathname(root->value()); - // we have moved to a different target, the broken source information - // is no longer valid - _broken_sources.clear(); - return YCPBoolean(true); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org