December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11928 - in /trunk/dialogsolver: CMakeLists.txt yast_plugin/CMakeLists.txt
by mlandres＠svn.opensuse.org 12 Dec '08

12 Dec '08

Author: mlandres Date: Fri Dec 12 10:55:24 2008 New Revision: 11928 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11928&view=rev Log: use FIND_PACKAGE to locate Libyui Modified: trunk/dialogsolver/CMakeLists.txt trunk/dialogsolver/yast_plugin/CMakeLists.txt Modified: trunk/dialogsolver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/CMakeLists.txt?rev=… ============================================================================== --- trunk/dialogsolver/CMakeLists.txt (original) +++ trunk/dialogsolver/CMakeLists.txt Fri Dec 12 10:55:24 2008 @@ -16,6 +16,7 @@ FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Zypp REQUIRED) +FIND_PACKAGE(Libyui REQUIRED) FIND_PACKAGE(Gettext REQUIRED) IF (GETTEXT_FOUND) MESSAGE(STATUS "Found Gettext: ${GETTEXT_SOURCE}") Modified: trunk/dialogsolver/yast_plugin/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/CMakeLi… ============================================================================== --- trunk/dialogsolver/yast_plugin/CMakeLists.txt (original) +++ trunk/dialogsolver/yast_plugin/CMakeLists.txt Fri Dec 12 10:55:24 2008 @@ -27,10 +27,9 @@ QT4_AUTOMOC(${qt_solver_dialog_plugin_SRCS}) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) -INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui ) +INCLUDE_DIRECTORIES( ${LIBYUI_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ../src ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11927 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes tests/zypp/base/String_test.cc zypp/base/String.cc zypp/base/String.h zypp/sat/detail/PoolImpl.cc
by mlandres＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: mlandres Date: Thu Dec 11 21:44:47 2008 New Revision: 11927 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11927&view=rev Log: - Add str::hexencode and str::hexdecode to encode special characters in a string as %XX. - Hexdecode modalias strings in rpm dependencies because rpm does not allow comma, blank and other special chars. (bnc #456695) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/tests/zypp/base/String_test.cc trunk/libzypp/zypp/base/String.cc trunk/libzypp/zypp/base/String.h trunk/libzypp/zypp/sat/detail/PoolImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11927&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Dec 11 21:44:47 2008 @@ -60,8 +60,8 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") -SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "8") +SET(LIBZYPP_MINOR "25") +SET(LIBZYPP_PATCH "0") # # LAST RELEASED: 5.24.7 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 11 21:44:47 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Dec 11 21:39:50 CET 2008 - ma(a)suse.de + +- Add str::hexencode and str::hexdecode to encode special characters + in a string as %XX. +- Hexdecode modalias strings in rpm dependencies because rpm does not + allow comma, blank and other special chars. (bnc #456695) +- revision 11927 + +------------------------------------------------------------------- Thu Dec 11 17:13:06 CET 2008 - ma(a)suse.de - Catch and report media errors when proving packages. (bnc #457652) Modified: trunk/libzypp/tests/zypp/base/String_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/base/String_t… ============================================================================== --- trunk/libzypp/tests/zypp/base/String_test.cc (original) +++ trunk/libzypp/tests/zypp/base/String_test.cc Thu Dec 11 21:44:47 2008 @@ -225,3 +225,28 @@ BOOST_CHECK( ! str::contains("abcXabcYabc", "xabcy") ); BOOST_CHECK( str::containsCI("abcXabcYabc", "xabcy") ); } + +BOOST_AUTO_TEST_CASE(hexencode_hexdecode) +{ + std::string o; + o.reserve( 256 ); + for ( unsigned i = 1; i < 256; ++i ) + o += i; + + std::string e( str::hexencode( o ) ); + // encoded contains nothing but [%a-zA-Z0-9] + for ( unsigned i = 0; i < 255; ++i ) + { + char ch = e[i]; + BOOST_CHECK( ch == '%' + || ( 'a' <= ch && ch <= 'z' ) + || ( 'A' <= ch && ch <= 'Z' ) + || ( '0' <= ch && ch <= '9' ) ); + } + + std::string d( str::hexdecode( e ) ); + BOOST_CHECK( o == d ); +// for ( unsigned i = 0; i < 255; ++i ) +// if ( o[i] != d[i] ) +// WAR << i << " " << unsigned(o[i]) << " != " << unsigned(d[i]) << endl; +} Modified: trunk/libzypp/zypp/base/String.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/base/String.cc (original) +++ trunk/libzypp/zypp/base/String.cc Thu Dec 11 21:44:47 2008 @@ -83,6 +83,78 @@ ); } + /////////////////////////////////////////////////////////////////// + // Hexencode + /////////////////////////////////////////////////////////////////// + namespace { + /** What's not decoded. */ + inline bool heIsAlNum( char ch ) + { + return ( ( 'a' <= ch && ch <= 'z' ) + ||( 'A' <= ch && ch <= 'Z' ) + ||( '0' <= ch && ch <= '9' ) ); + } + /** Hex-digit to number or -1. */ + inline int heDecodeCh( char ch ) + { + if ( '0' <= ch && ch <= '9' ) + return( ch - '0' ); + if ( 'A' <= ch && ch <= 'Z' ) + return( ch - 'A' + 10 ); + if ( 'a' <= ch && ch <= 'z' ) + return( ch - 'A' + 10 ); + return -1; + } + } + + std::string hexencode( const C_Str & str_r ) + { + static const char *const hdig = "0123456789ABCDEF"; + std::string res; + res.reserve( str_r.size() ); + for ( const char * it = str_r.c_str(); *it; ++it ) + { + if ( heIsAlNum( *it ) ) + { + res += *it; + } + else + { + res += '%'; + res += hdig[(unsigned char)(*it)/16]; + res += hdig[(unsigned char)(*it)%16]; + } + } + return res; + } + + std::string hexdecode( const C_Str & str_r ) + { + std::string res; + res.reserve( str_r.size() ); + for_( it, str_r.c_str(), str_r.c_str()+str_r.size() ) + { + if ( *it == '%' ) + { + int d1 = heDecodeCh( *(it+1) ); + if ( d1 != -1 ) + { + int d2 = heDecodeCh( *(it+2) ); + if ( d2 != -1 ) + { + res += (d1<<4)|d2; + it += 2; + continue; + } + } + } + // verbatim if no %XX: + res += *it; + } + return res; + } + /////////////////////////////////////////////////////////////////// + /****************************************************************** ** ** FUNCTION NAME : toLower @@ -285,6 +357,7 @@ } + /****************************************************************** ** ** Modified: trunk/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.h?rev=1… ============================================================================== --- trunk/libzypp/zypp/base/String.h (original) +++ trunk/libzypp/zypp/base/String.h Thu Dec 11 21:44:47 2008 @@ -584,6 +584,11 @@ * * For use when printing \a c separated values, and where * \ref joinEscaped() is too heavy. + * + * \todo use C_Str instead of std::string to prevent unnecessary + * promotion to string if used with "string". + * + * \todo shoud not be documented in doxy-group 'Join' */ std::string escape(const std::string & str_r, const char c = ' ' ); @@ -591,6 +596,20 @@ //@} /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + /** \name Hexencode. + * Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + //@{ + /** Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + std::string hexencode( const C_Str & str_r ); + /** Decode hexencoded %XX sequences. */ + std::string hexdecode( const C_Str & str_r ); + //@} + /////////////////////////////////////////////////////////////////// /** \name Case conversion. */ //@{ Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Thu Dec 11 21:44:47 2008 @@ -107,7 +107,11 @@ case NAMESPACE_MODALIAS: { - return target::Modalias::instance().query( IdString(rhs) ) ? RET_systemProperty : RET_unsupported; + // modalias strings in capability may be hexencoded because rpm does not allow + // ',', ' ' or other special chars. + return target::Modalias::instance().query( str::hexdecode( IdString(rhs).c_str() ) ) + ? RET_systemProperty + : RET_unsupported; } break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11926 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/repo/PackageProvider.cc
by mlandres＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: mlandres Date: Thu Dec 11 17:16:23 2008 New Revision: 11926 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11926&view=rev Log: - Catch and report media errors when proving packages. (bnc #457652) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/repo/PackageProvider.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11926&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Dec 11 17:16:23 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_PATCH "8") # # LAST RELEASED: 5.24.7 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 11 17:16:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 11 17:13:06 CET 2008 - ma(a)suse.de + +- Catch and report media errors when proving packages. (bnc #457652) +- revision 11926 + +------------------------------------------------------------------- Wed Dec 10 16:09:08 CET 2008 - ma(a)suse.de - Remove obsolete zypp.conf::productsdir and deprecate Modified: trunk/libzypp/zypp/repo/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvide… ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.cc (original) +++ trunk/libzypp/zypp/repo/PackageProvider.cc Thu Dec 11 17:16:23 2008 @@ -103,14 +103,44 @@ { ret = doProvidePackage(); } - catch ( const Exception & excpt ) + catch ( const UserRequestException & excpt ) { + // UserRequestException e.g. from failOnChecksumError was already reported. ERR << "Failed to provide Package " << _package << endl; if ( ! _retry ) { ZYPP_RETHROW( excpt ); } } + catch ( const Exception & excpt ) + { + ERR << "Failed to provide Package " << _package << endl; + if ( ! _retry ) + { + // Aything else gets reported + std::string package_str = _package->name() + "-" + _package->edition().asString(); + + // TranslatorExplanation %s = name of the package being processed. + std::string detail_str( str::form(_("Failed to provide Package %s. Do you want to retry retrieval?"), package_str.c_str() ) ); + detail_str += str::form( "\n\n%s\n%s", excpt.asUserString().c_str(), excpt.historyAsString().c_str() ); + + switch ( report()->problem( _package, repo::DownloadResolvableReport::IO, detail_str.c_str() ) ) + { + case repo::DownloadResolvableReport::RETRY: + _retry = true; + break; + case repo::DownloadResolvableReport::IGNORE: + ZYPP_THROW(SkipRequestException("User requested skip of corrupted file")); + break; + case repo::DownloadResolvableReport::ABORT: + ZYPP_THROW(AbortRequestException("User requested to abort")); + break; + default: + ZYPP_RETHROW( excpt ); + break; + } + } + } } while ( _retry ); report()->finish( _package, repo::DownloadResolvableReport::NO_ERROR, std::string() ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11925 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: jkupec Date: Thu Dec 11 11:20:03 2008 New Revision: 11925 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11925&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Thu Dec 11 11:20:03 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Dec 11 11:20:42 CET 2008 - jkupec(a)suse.cz + +- fixed typo (bnc #458248) +- r11924 + +------------------------------------------------------------------- +Fri Dec 5 14:55:00 CET 2008 - jkupec(a)suse.cz + +- man page update (fixes also bnc #450857) + +------------------------------------------------------------------- Mon Dec 1 16:53:29 CET 2008 - jkupec(a)suse.cz - fixed handling of source-install -d and -D options (bnc #428131) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11924 - /trunk/zypper/src/Zypper.cc
by jkupec＠svn.opensuse.org 11 Dec '08

11 Dec '08

Author: jkupec Date: Thu Dec 11 11:11:41 2008 New Revision: 11924 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11924&view=rev Log: - typo (bnc #458248) Modified: trunk/zypper/src/Zypper.cc Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11924&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Thu Dec 11 11:11:41 2008 @@ -2999,7 +2999,7 @@ if (!_arguments.empty()) // translators: rug related message, shown if // 'zypper in --entire-catalog foorepo someargument' is specified - out().warning(_("Ingoring arguments, marking the entire repository.")); + out().warning(_("Ignoring arguments, marking the entire repository.")); _arguments.clear(); _arguments.push_back("*"); _copts["from"] = _copts["entire-catalog"]; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11923 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:10:51 2008 New Revision: 11923 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11923&view=rev Log: changes Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11923&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Wed Dec 10 16:10:51 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "24") SET(LIBZYPP_PATCH "7") # -# LAST RELEASED: 5.24.6 (23) +# LAST RELEASED: 5.24.7 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Wed Dec 10 16:10:51 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Dec 10 16:09:08 CET 2008 - ma(a)suse.de + +- Remove obsolete zypp.conf::productsdir and deprecate + ZConfig::productsPath(). +- Monitor /etc/products.d to determine if @system.solv needs to be + rebuilt. (bnc #457933) +- revision 11923 +- version 5.24.7 (23) + +------------------------------------------------------------------- Mon Dec 8 15:31:18 CET 2008 - ma(a)suse.de - Execute patch scripts chroot to the installed system. (bnc #456795) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11922 - in /trunk/libzypp/zypp: RepoStatus.cc RepoStatus.h target/TargetImpl.cc
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:08:47 2008 New Revision: 11922 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11922&view=rev Log: Monitor /etc/products.d to determine if @system.solv needs to be rebuilt. (bnc #457933) Modified: trunk/libzypp/zypp/RepoStatus.cc trunk/libzypp/zypp/RepoStatus.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp/RepoStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.cc?rev=1… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.cc (original) +++ trunk/libzypp/zypp/RepoStatus.cc Wed Dec 10 16:08:47 2008 @@ -72,6 +72,20 @@ : _pimpl( new Impl() ) {} + RepoStatus::RepoStatus( const Pathname &path ) + : _pimpl( new Impl() ) + { + PathInfo info(path); + if ( info.isExist() ) + { + _pimpl->timestamp = Date(info.mtime()); + if ( info.isFile() ) + _pimpl->checksum = filesystem::sha1sum(path); + else // non files + _pimpl->checksum = str::numstring(info.mtime()); + } + } + /////////////////////////////////////////////////////////////////// // // METHOD NAME : RepoStatus::~RepoStatus @@ -107,17 +121,6 @@ file.close(); } - RepoStatus::RepoStatus( const Pathname &path ) - : _pimpl( new Impl() ) - { - PathInfo info(path); - if ( info.isExist() ) - { - _pimpl->checksum = filesystem::sha1sum(path); - _pimpl->timestamp = Date(info.mtime()); - } - } - bool RepoStatus::empty() const { return _pimpl->checksum.empty(); Modified: trunk/libzypp/zypp/RepoStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.h?rev=11… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.h (original) +++ trunk/libzypp/zypp/RepoStatus.h Wed Dec 10 16:08:47 2008 @@ -105,6 +105,14 @@ * * \note construct from a non existing * file will result in an empty status + * + * \note construct from a directory, the + * directories mtime will be also used as + * checksum. + * + * \todo Add recursive option for dirs so we finaly get + * the same as \ref parser::plaindir::dirStatus and can + * unify both. */ RepoStatus( const Pathname &file ); Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Wed Dec 10 16:08:47 2008 @@ -455,7 +455,9 @@ bool build_rpm_solv = true; // lets see if the rpm solv cache exists - RepoStatus rpmstatus(_root + "/var/lib/rpm/Name"); + RepoStatus rpmstatus( RepoStatus( _root/"/var/lib/rpm/Name" ) + && (_root/"/etc/products.d") ); + bool solvexisted = PathInfo(rpmsolv).isExist(); if ( solvexisted ) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11921 - in /trunk/libzypp: zypp.conf zypp/ZConfig.cc zypp/ZConfig.h
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:08:27 2008 New Revision: 11921 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11921&view=rev Log: Remove obsolete zypp.conf::productsdir and deprecate ZConfig::productsPath() Modified: trunk/libzypp/zypp.conf trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h Modified: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=11921&r1=1… ============================================================================== --- trunk/libzypp/zypp.conf (original) +++ trunk/libzypp/zypp.conf Wed Dec 10 16:08:27 2008 @@ -167,18 +167,6 @@ ## -## Path where additional product information, .prod files are kept -## -## Valid values: A directory -## Default value: {configdir}/products.d -## -## Changing this is not recommended, as the directory might -## be populated by packages dropping files to /etc/zypp/products.d. -## -# productsdir = /etc/zypp/products.d - - -## ## Whether required packages are installed ONLY ## So recommended packages, language packages and packages which depend ## on hardware (modalias) will not be regarded. Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=1192… ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Wed Dec 10 16:08:27 2008 @@ -246,6 +246,7 @@ } else if ( entry == "productsdir" ) { + WAR << "Deprecated entry 'productsdir=': This locations is no longer used or supported." << endl; cfg_products_path = Pathname(value); } else if ( entry == "solver.onlyRequires" ) Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=11921… ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Wed Dec 10 16:08:27 2008 @@ -173,8 +173,9 @@ /** * Directory for additional product information (configPath()/products.d) * \ingroup g_ZC_CONFIGFILES + * \deprecated This locations is no longer used or supported. */ - Pathname productsPath() const; + Pathname productsPath() const ZYPP_DEPRECATED; /** * Solver regards required packages,patterns,... only -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11920 - /trunk/libzypp/devel/devel.ma/NewPool.cc
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:00:54 2008 New Revision: 11920 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11920&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/NewPool.cc Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Wed Dec 10 16:00:54 2008 @@ -453,13 +453,14 @@ getZYpp()->initializeTarget( sysRoot ); } getZYpp()->target()->load(); + USR << "baseproduct: " << getZYpp()->target()->baseProduct() << endl; USR << "targetDistribution: " << getZYpp()->target()->targetDistribution() << endl; USR << "targetDistributionRelease: " << getZYpp()->target()->targetDistributionRelease() << endl; dumpRange( USR << "Product ", pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) << endl; } } - if ( 1 ) + if ( 0 ) { RepoManager repoManager( makeRepoManager( sysRoot ) ); ServiceInfoList services = repoManager.knownServices(); @@ -560,9 +561,7 @@ } } - - MIL << Arch_ppc.compatibleWith( Arch_x86_64 ) << endl; - MIL << Arch_i586.compatibleWith( Arch_x86_64 ) << endl; + SEC << "baseproduct: " << getZYpp()->target()->baseProduct() << endl; #if 0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11919 - /trunk/sat-solver/bindings/pool.i
by mlschroe＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlschroe Date: Wed Dec 10 14:11:50 2008 New Revision: 11919 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11919&view=rev Log: - delete pool_createwhatprovides() call, makes no sense here Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Wed Dec 10 14:11:50 2008 @@ -237,9 +237,6 @@ void each_provider( int id ) { if (id > 0 && id < $self->whatprovidesdataoff) { - if (!$self->whatprovides) - pool_createwhatprovides($self); - while ($self->whatprovidesdata[id]) { generic_xsolvables_iterate_callback( xsolvable_new( $self, $self->whatprovidesdata[id++] ), NULL ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11918 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: kkaempf Date: Wed Dec 10 12:37:18 2008 New Revision: 11918 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11918&view=rev Log: provide access to whatprovidesdata via Pool.each_provider(int) Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Wed Dec 10 12:37:18 2008 @@ -61,6 +61,8 @@ { return xsolvable_new( $self, (Id)id); } + Relation *relation( int rel ) + { return relation_new( $self, (Id)rel ); } #if defined(SWIGRUBY) %{ @@ -232,6 +234,18 @@ } } + void each_provider( int id ) + { + if (id > 0 && id < $self->whatprovidesdataoff) { + if (!$self->whatprovides) + pool_createwhatprovides($self); + + while ($self->whatprovidesdata[id]) { + generic_xsolvables_iterate_callback( xsolvable_new( $self, $self->whatprovidesdata[id++] ), NULL ); + } + } + } + #endif #if defined(SWIGPERL) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11917 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes
by dmacvicar＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: dmacvicar Date: Wed Dec 10 10:46:31 2008 New Revision: 11917 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11917&view=rev Log: bump Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Wed Dec 10 10:46:31 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "27") +SET(LIBZYPP_MINOR "28") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "0") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Wed Dec 10 10:46:31 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 10 10:43:29 CET 2008 - dmacvicar(a)suse.de + +- bump version due to new public method +- 4.28.0 + +------------------------------------------------------------------- Mon Dec 8 10:47:33 CET 2008 - schubi(a)suse.de - Make the solver reset function public (bnc #439373) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11916 - /trunk/tools/patch2mail/patch2mail.spec
by cboltz＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: cboltz Date: Tue Dec 9 23:08:06 2008 New Revision: 11916 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11916&view=rev Log: - changed URL in specfile to point to articles tagged "patch2mail" in my blog (consider this the official patch2mail homepage ;-) Modified: trunk/tools/patch2mail/patch2mail.spec Modified: trunk/tools/patch2mail/patch2mail.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.spec… ============================================================================== --- trunk/tools/patch2mail/patch2mail.spec (original) +++ trunk/tools/patch2mail/patch2mail.spec Tue Dec 9 23:08:06 2008 @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bash # -URL: http://www.cboltz.de +URL: http://blog.cboltz.de/plugin/tag/patch2mail Source: %{name}-%{version}.tar.bz2 # Summary: Patch notification via mail -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11915 - in /trunk/tools/patch2mail: patch2mail patch2mail.changes patch2mail.spec patch2mail.xsl patch2mail.xsl_10.3 patch2mail_11.0
by cboltz＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: cboltz Date: Tue Dec 9 13:35:09 2008 New Revision: 11915 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11915&view=rev Log: - some small output fixes - enforce LANG=C to avoid charset problems in zypper output - version 0.9.4 - added patch2mail_11.0 and patch2mail.xsl_10.3 to SVN (were forgotten on last commit) Added: trunk/tools/patch2mail/patch2mail.xsl_10.3 trunk/tools/patch2mail/patch2mail_11.0 (with props) Modified: trunk/tools/patch2mail/patch2mail trunk/tools/patch2mail/patch2mail.changes trunk/tools/patch2mail/patch2mail.spec trunk/tools/patch2mail/patch2mail.xsl Modified: trunk/tools/patch2mail/patch2mail URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail?rev=… ============================================================================== --- trunk/tools/patch2mail/patch2mail (original) +++ trunk/tools/patch2mail/patch2mail Tue Dec 9 13:35:09 2008 @@ -3,7 +3,7 @@ tmp="$(mktemp /tmp/updates.XXXXXX)" /usr/sbin/zypp-refresh-wrapper >/dev/null -/usr/bin/zypper --xmlout lu -t patch | xsltproc /usr/share/patch2mail/patch2mail.xsl - > "$tmp" +LANG=C /usr/bin/zypper --xmlout lu -t patch | xsltproc /usr/share/patch2mail/patch2mail.xsl - > "$tmp" grep "ERROR\|^===" "$tmp" >/dev/null || { rm -f "$tmp" exit 0 # no updates, no errors Modified: trunk/tools/patch2mail/patch2mail.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.chan… ============================================================================== --- trunk/tools/patch2mail/patch2mail.changes (original) +++ trunk/tools/patch2mail/patch2mail.changes Tue Dec 9 13:35:09 2008 @@ -1,3 +1,8 @@ +Tue Dec 09 13:24:00 CET 2008 - cboltz +- some small output fixes +- enforce LANG=C to avoid charset problems in zypper output +- version 0.9.4 + Fri Nov 21 20:45:00 CEST 2008 - cboltz - update for openSUSE 11.1 (zypper needs "lu -t patch" now) Modified: trunk/tools/patch2mail/patch2mail.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.spec… ============================================================================== --- trunk/tools/patch2mail/patch2mail.spec (original) +++ trunk/tools/patch2mail/patch2mail.spec Tue Dec 9 13:35:09 2008 @@ -1,7 +1,7 @@ # norootforbuild # Name: patch2mail -Version: 0.9.3 +Version: 0.9.4 Release: 1 # License: GPL @@ -69,6 +69,14 @@ %doc README %changelog + +* Tue Dec 09 2008 - cboltz +- some small output fixes +- enforce LANG=C to avoid charset problems in zypper output +- version 0.9.4 +* Fri Nov 21 2008 - cboltz +- update for openSUSE 11.1 (zypper needs "lu -t patch" now) +- version 0.9.3 * Sun Jul 20 2008 - cboltz - update for openSUSE 11.0 (scripts for older versions still included) - version 0.9.2 Modified: trunk/tools/patch2mail/patch2mail.xsl URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.xsl?… ============================================================================== --- trunk/tools/patch2mail/patch2mail.xsl (original) +++ trunk/tools/patch2mail/patch2mail.xsl Tue Dec 9 13:35:09 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-15"?>  -<xsl:stylesheet version="1.1" +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - +<xsl:output method="text"/> <xsl:strip-space elements="*"/> @@ -30,9 +29,8 @@ <xsl:template match="/"><xsl:apply-templates /></xsl:template> <xsl:template match="update-status"> -<xsl:document href="-" method="text" ><xsl:apply-templates /> -</xsl:document></xsl:template> - +<xsl:apply-templates /> +</xsl:template>  @@ -93,8 +91,16 @@ <xsl:template match="update-list/update/source">Update source: <xsl:value-of select="@alias" /> (<xsl:value-of select="@url" />)</xsl:template> --> + +<xsl:template match="message"> + <xsl:if test="@type != 'info'"> + <xsl:text>
ERROR: </xsl:text> + <xsl:apply-templates /> + <xsl:text>
</xsl:text> + </xsl:if> +</xsl:template> - + <xsl:template match="update-summary"> <xsl:text>--------------------------------------------------------

</xsl:text> Added: trunk/tools/patch2mail/patch2mail.xsl_10.3 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.xsl_… ============================================================================== --- trunk/tools/patch2mail/patch2mail.xsl_10.3 (added) +++ trunk/tools/patch2mail/patch2mail.xsl_10.3 Tue Dec 9 13:35:09 2008 @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="ISO-8859-15"?> + + +<xsl:stylesheet version="1.1" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + + +<xsl:strip-space elements="*"/> + + +<xsl:template match="/"><xsl:apply-templates /></xsl:template> + +<xsl:template match="update-status"> +<xsl:document href="-" method="text" ><xsl:apply-templates /> +</xsl:document></xsl:template> + + + + +<xsl:template match="errors"><xsl:apply-templates /></xsl:template> + +<xsl:template match="errors/error"> + <xsl:text>*** ERROR ***
</xsl:text> + <xsl:apply-templates /> + <xsl:text>

</xsl:text> +</xsl:template> + + + + +<xsl:template match="update-sources"> + <xsl:text>Update sources:
</xsl:text> + <xsl:apply-templates /> + <xsl:text>
</xsl:text> +</xsl:template> + +<xsl:template match="update-sources/source"> + <xsl:text>- </xsl:text> + <xsl:value-of select="@alias" /> (<xsl:value-of select="@url" />) +</xsl:template> + + + + +<xsl:template match="update-list"> + <xsl:apply-templates /> +</xsl:template> + +<xsl:template match="update-list/update"> +<xsl:if test="@kind = 'patch'"> + <xsl:text>
=== </xsl:text> + <xsl:value-of select="@name" /> + <xsl:text> - Patch </xsl:text> + <xsl:value-of select="@edition" /> + <xsl:text> (</xsl:text> + <xsl:value-of select="@category" /> + <xsl:text>) ===

</xsl:text> + <xsl:apply-templates /> + <xsl:text>
</xsl:text> +</xsl:if> +</xsl:template> + +<xsl:template match="update-list/update/summary"> + <xsl:apply-templates /> +</xsl:template> + +<xsl:template match="update-list/update/description"> + <xsl:text>

</xsl:text> + <xsl:apply-templates /> +</xsl:template> + + + + + + + +<xsl:template match="update-summary"> + <xsl:text>--------------------------------------------------------

</xsl:text> + <xsl:text> Total: </xsl:text> + <xsl:value-of select="@total" /> + <xsl:text> updates (</xsl:text> + <xsl:value-of select="@security" /> + <xsl:text> security)
__TOTAL__</xsl:text> + <xsl:value-of select="@total" /><xsl:value-of select="@security" /> + <xsl:text>__
</xsl:text> +</xsl:template> + + + + +</xsl:stylesheet> Added: trunk/tools/patch2mail/patch2mail_11.0 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail_11.0… ============================================================================== --- trunk/tools/patch2mail/patch2mail_11.0 (added) +++ trunk/tools/patch2mail/patch2mail_11.0 Tue Dec 9 13:35:09 2008 @@ -0,0 +1,14 @@ +#!/bin/bash + +tmp="$(mktemp /tmp/updates.XXXXXX)" + +/usr/sbin/zypp-refresh-wrapper >/dev/null +/usr/bin/zypper --xmlout lu | xsltproc /usr/share/patch2mail/patch2mail.xsl - > "$tmp" +grep "ERROR\|^===" "$tmp" >/dev/null || { + rm -f "$tmp" + exit 0 # no updates, no errors +} + +grep -v "^__TOTAL__" "$tmp" | mail -s "$(hostname) updates" root +# echo "*** $(hostname) updates ***"; grep -v "^__TOTAL__" "$tmp" +rm -f "$tmp" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11914 - in /trunk/sat-solver: applayer/decision.c applayer/decision.h bindings/decision.i bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: kkaempf Date: Tue Dec 9 12:49:09 2008 New Revision: 11914 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11914&view=rev Log: fix 'rule' pointer in decisions to detect '0'-rule correctly Modified: trunk/sat-solver/applayer/decision.c trunk/sat-solver/applayer/decision.h trunk/sat-solver/bindings/decision.i trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Tue Dec 9 12:49:09 2008 @@ -20,10 +20,10 @@ #include "solverdebug.h" Decision * -decision_new( Pool *pool, int op, Id solvable, Rule *rule ) +decision_new( Solver *solver, int op, Id solvable, Rule *rule ) { Decision *d = (Decision *)malloc( sizeof( Decision )); - d->pool = pool; + d->solver = solver; d->op = op; d->solvable = solvable; d->rule = rule; @@ -39,7 +39,6 @@ void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data ) { - Pool *pool = solver->pool; Repo *installed = solver->installed; Id p, *obsoletesmap = solver_create_decisions_obsoletesmap( solver ); Id s; @@ -78,7 +77,7 @@ s = p; if (installed) { - Solvable *solv = pool_id2solvable( pool, p ); + Solvable *solv = pool_id2solvable( solver->pool, p ); if (solv->repo == installed) continue; /* don't report 'keep installed' decision */ } @@ -91,7 +90,7 @@ op = DECISION_INSTALL; } } - d = decision_new( pool, op, s, why ? solver->rules + why : NULL ); + d = decision_new( solver, op, s, solver->rules + why ); if (callback( d, user_data )) break; } Modified: trunk/sat-solver/applayer/decision.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.h?r… ============================================================================== --- trunk/sat-solver/applayer/decision.h (original) +++ trunk/sat-solver/applayer/decision.h Tue Dec 9 12:49:09 2008 @@ -17,7 +17,6 @@ * */ -#include "pool.h" #include "solver.h" enum decisions { @@ -29,12 +28,12 @@ typedef struct _Decision { enum decisions op; - Pool *pool; + Solver *solver; Id solvable; Rule *rule; } Decision; -Decision *decision_new( Pool *pool, int op, Id solvable, Rule *rule ); +Decision *decision_new( Solver *solver, int op, Id solvable, Rule *rule ); void decision_free( Decision *d ); void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data); Modified: trunk/sat-solver/bindings/decision.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/decision.i?r… ============================================================================== --- trunk/sat-solver/bindings/decision.i (original) +++ trunk/sat-solver/bindings/decision.i Tue Dec 9 12:49:09 2008 @@ -18,8 +18,8 @@ ~Decision() { decision_free( $self ); } - Pool *pool() - { return $self->pool; } + Solver *solver() + { return $self->solver; } int op() { return $self->op; } const char *op_s() @@ -33,8 +33,11 @@ return "unknown"; } XSolvable *solvable() - { return xsolvable_new( $self->pool, $self->solvable ); } + { return xsolvable_new( $self->solver->pool, $self->solvable ); } Rule *rule() - { return $self->rule; } + { if ($self->rule > $self->solver->rules) + return $self->rule; + return NULL; + } } Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Tue Dec 9 12:49:09 2008 @@ -74,6 +74,36 @@ end # class Rule end +def explain solver, transaction + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" + e = solver.explain( transaction, d) + if e.nil? + puts "\t unexplainable" + else + pis = pi_s e.shift + rel = e.shift + src = e.shift + if src.nil? + puts "\t #{pis}" + else + tgt = e.shift + if tgt + puts "\t [#{src}: #{pis} #{rel} provided by #{tgt}]" + else + puts "\t [#{src}: #{pis} #{rel}]" + end + end + end + end +end + # SolverProbleminfo to string def pi_s pi case pi @@ -118,23 +148,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + def test_indirect_requires solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 @@ -155,23 +172,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_indirect_requires_choose solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 @@ -195,23 +199,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_install_bash solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-beta5-i386.solv" repo = @pool.add_solv( solvpath ) @@ -225,29 +216,10 @@ solver = @pool.create_solver( ) # solver.dont_install_recommended = true solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - puts "#{solver.rule_count} rules" - puts "rpm(#{solver.rpmrules_start}..#{solver.rpmrules_end})" - puts "feature(#{solver.featurerules_start}..#{solver.featurerules_end})" - puts "update(#{solver.updaterules_start}..#{solver.updaterules_end})" - puts "job(#{solver.jobrules_start}..#{solver.jobrules_end})" - puts "learnt(#{solver.learntrules_start}..#{solver.learntrules_end})" - solver.each_decision do |d| - puts " #{d.solvable}\n\t#{d.op_s} (#{d.rule}:#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_conflicts installed = @pool.create_repo( 'installed' ) solv1 = installed.create_solvable( 'A', '1.0-0' ) @@ -270,23 +242,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_obsoletes installed = @pool.create_repo( 'installed' ) solv1 = installed.create_solvable( 'A', '1.0-0' ) @@ -308,23 +267,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_indirect_removal solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 @@ -348,21 +294,7 @@ solver = @pool.create_solver( ) solver.allow_uninstall = true solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11913 - /trunk/sat-solver/bindings/solver.i
by kkaempf＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: kkaempf Date: Tue Dec 9 12:48:26 2008 New Revision: 11913 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11913&view=rev Log: return a NULL explaination if no rule corresponding to a decision is known Modified: trunk/sat-solver/bindings/solver.i Modified: trunk/sat-solver/bindings/solver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solver.i?rev… ============================================================================== --- trunk/sat-solver/bindings/solver.i (original) +++ trunk/sat-solver/bindings/solver.i Tue Dec 9 12:48:26 2008 @@ -302,20 +302,18 @@ #endif explain(Transaction *t, Decision *decision) { - Id depp = 0, sourcep = 0, targetp = 0; - SolverProbleminfo pi; - Swig_Type result = Swig_Array(); + Swig_Type result = Swig_Null; Id rule = decision->rule - $self->rules; if (rule > 0) { - pi = solver_problemruleinfo($self, &(t->queue), rule, &depp, &sourcep, &targetp); + Id depp = 0, sourcep = 0, targetp = 0; + SolverProbleminfo pi = solver_problemruleinfo($self, &(t->queue), rule, &depp, &sourcep, &targetp); + result = Swig_Array(); +/* fprintf(stderr, "Rule %d: [pi %d, rel %d, source %d, target %d]\n", rule, pi, depp, sourcep, targetp); */ Swig_Append(result, Swig_Int(pi)); + Swig_Append(result, SWIG_NewPointerObj((void*)relation_new($self->pool, depp), SWIGTYPE_p__Relation, 0)); + Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, sourcep), SWIGTYPE_p__Solvable, 0)); + Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, targetp), SWIGTYPE_p__Solvable, 0)); } - else { - Swig_Append(result, Swig_Int(-1)); - } - Swig_Append(result, SWIG_NewPointerObj((void*)relation_new($self->pool, depp), SWIGTYPE_p__Relation, 0)); - Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, sourcep), SWIGTYPE_p__Solvable, 0)); - Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, targetp), SWIGTYPE_p__Solvable, 0)); return result; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11912 - in /trunk/sat-solver: applayer/decision.c applayer/decision.h bindings/decision.i bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: kkaempf Date: Tue Dec 9 12:02:04 2008 New Revision: 11912 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11912&view=rev Log: drop 'reason' from decision struct, solver::explain is more informative Modified: trunk/sat-solver/applayer/decision.c trunk/sat-solver/applayer/decision.h trunk/sat-solver/bindings/decision.i trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Tue Dec 9 12:02:04 2008 @@ -20,13 +20,12 @@ #include "solverdebug.h" Decision * -decision_new( Pool *pool, int op, Id solvable, Id reason, Rule *rule ) +decision_new( Pool *pool, int op, Id solvable, Rule *rule ) { Decision *d = (Decision *)malloc( sizeof( Decision )); d->pool = pool; d->op = op; d->solvable = solvable; - d->reason = reason; d->rule = rule; return d; } @@ -43,7 +42,7 @@ Pool *pool = solver->pool; Repo *installed = solver->installed; Id p, *obsoletesmap = solver_create_decisions_obsoletesmap( solver ); - Id s, r; + Id s; int why; int op; Decision *d; @@ -52,30 +51,10 @@ if (!callback) return; /* no use to iterate without callback */ -#if 0 - if (installed) - { - FOR_REPO_SOLVABLES(installed, p, s) - { - if (solver->decisionmap[p] >= 0) - continue; - if (obsoletesmap[p]) - { - d = decision_new( pool, DECISION_OBSOLETE, s, pool_id2solvable( pool, obsoletesmap[p] ) ); - } - else - { - d = decision_new( pool, DECISION_REMOVE, s, NULL ); - } - callback( d, user_data ); - } - } -#endif for ( i = 0; i < solver->decisionq.count; i++) { p = solver->decisionq.elements[i]; why = solver->decisionq_why.elements[i]; - r = 0; if (p < 0) /* remove */ { @@ -84,7 +63,6 @@ if (obsoletesmap[p]) { op = DECISION_OBSOLETE; - r = obsoletesmap[p]; } else { @@ -93,7 +71,7 @@ } else if (p == SYSTEMSOLVABLE) { - continue; + continue; /* don't report 'keep system solvable installed' decision */ } else /* p > 0 */ { @@ -102,27 +80,18 @@ { Solvable *solv = pool_id2solvable( pool, p ); if (solv->repo == installed) - continue; /* thats a 'keep installed' decision, don't report */ + continue; /* don't report 'keep installed' decision */ } - if (!obsoletesmap[p]) + if (obsoletesmap[p]) { - op = DECISION_INSTALL; + op = DECISION_UPDATE; } else { - int j; - op = DECISION_UPDATE; - for (j = installed->start; j < installed->end; j++) - { - if (obsoletesmap[j] == p) - { - r = j; - break; - } - } + op = DECISION_INSTALL; } } - d = decision_new( pool, op, s, r, why ? solver->rules + why : NULL ); + d = decision_new( pool, op, s, why ? solver->rules + why : NULL ); if (callback( d, user_data )) break; } Modified: trunk/sat-solver/applayer/decision.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.h?r… ============================================================================== --- trunk/sat-solver/applayer/decision.h (original) +++ trunk/sat-solver/applayer/decision.h Tue Dec 9 12:02:04 2008 @@ -31,11 +31,10 @@ enum decisions op; Pool *pool; Id solvable; - Id reason; Rule *rule; } Decision; -Decision *decision_new( Pool *pool, int op, Id solvable, Id reason, Rule *rule ); +Decision *decision_new( Pool *pool, int op, Id solvable, Rule *rule ); void decision_free( Decision *d ); void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data); Modified: trunk/sat-solver/bindings/decision.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/decision.i?r… ============================================================================== --- trunk/sat-solver/bindings/decision.i (original) +++ trunk/sat-solver/bindings/decision.i Tue Dec 9 12:02:04 2008 @@ -34,8 +34,6 @@ } XSolvable *solvable() { return xsolvable_new( $self->pool, $self->solvable ); } - XSolvable *reason() - { return xsolvable_new( $self->pool, $self->reason ); } Rule *rule() { return $self->rule; } } Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Tue Dec 9 12:02:04 2008 @@ -89,7 +89,7 @@ when Satsolver::SOLVER_PROBLEM_SELF_CONFLICT: "self conflict" when Satsolver::SOLVER_PROBLEM_RPM_RULE: "rpm rule" else - "unknown" + "unknown (#{pi})" end end @@ -126,7 +126,7 @@ } solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift @@ -163,7 +163,7 @@ } solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift @@ -203,7 +203,7 @@ } solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift @@ -223,7 +223,7 @@ @pool.prepare solver = @pool.create_solver( ) - solver.dont_install_recommended = true +# solver.dont_install_recommended = true solver.solve( transaction ) solver.each_to_install { |s| puts "Install #{s}" @@ -239,7 +239,7 @@ puts "job(#{solver.jobrules_start}..#{solver.jobrules_end})" puts "learnt(#{solver.learntrules_start}..#{solver.learntrules_end})" solver.each_decision do |d| - puts " #{d.solvable}\n\t#{d.op_s} (#{d.rule}:#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + puts " #{d.solvable}\n\t#{d.op_s} (#{d.rule}:#{d.rule.to_dep(@pool) if d.rule})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift @@ -278,7 +278,7 @@ } solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift @@ -316,7 +316,7 @@ } solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift @@ -356,7 +356,7 @@ } solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" e = solver.explain( transaction, d) pis = pi_s e.shift rel = e.shift -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11911 - /trunk/sat-solver/bindings/solver.i
by kkaempf＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: kkaempf Date: Tue Dec 9 12:01:29 2008 New Revision: 11911 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11911&view=rev Log: fix check for rule before calling problemruleinfo Modified: trunk/sat-solver/bindings/solver.i Modified: trunk/sat-solver/bindings/solver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solver.i?rev… ============================================================================== --- trunk/sat-solver/bindings/solver.i (original) +++ trunk/sat-solver/bindings/solver.i Tue Dec 9 12:01:29 2008 @@ -305,8 +305,9 @@ Id depp = 0, sourcep = 0, targetp = 0; SolverProbleminfo pi; Swig_Type result = Swig_Array(); - if (decision->rule > 0) { - pi = solver_problemruleinfo($self, &(t->queue), decision->rule - $self->rules, &depp, &sourcep, &targetp); + Id rule = decision->rule - $self->rules; + if (rule > 0) { + pi = solver_problemruleinfo($self, &(t->queue), rule, &depp, &sourcep, &targetp); Swig_Append(result, Swig_Int(pi)); } else { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11910 - /trunk/libzypp/po/sk.po
by jkupec＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: jkupec Date: Tue Dec 9 11:24:22 2008 New Revision: 11910 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11910&view=rev Log: - slovak translation Modified: trunk/libzypp/po/sk.po Modified: trunk/libzypp/po/sk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sk.po?rev=11910&r1=11… ============================================================================== --- trunk/libzypp/po/sk.po (original) +++ trunk/libzypp/po/sk.po Tue Dec 9 11:24:22 2008 @@ -7,14 +7,14 @@ # Stanislav Visnovsky <visnovsky(a)kde.org>, 2003. # Milan Hromada <mhromada(a)elas.sk>, 2000. # Ladislav MichnoviÄ <lmichnovic(a)suse.cz>, 2008. -# JÃ¡n Kupec <jkupec(a)suse.cz>, 2007. +# JÃ¡n Kupec <jkupec(a)suse.cz>, 2008. msgid "" msgstr "" "Project-Id-Version: zypp.sk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-21 09:10+0100\n" -"PO-Revision-Date: 2008-05-23 17:05+0100\n" -"Last-Translator: Ladislav MichnoviÄ <lmichnovic(a)suse.cz>\n" +"PO-Revision-Date: 2008-12-09 10:32+0100\n" +"Last-Translator: Jan Kupec <jkupec(a)suse.cz>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,17 +37,16 @@ #: ../zypp/target/TargetImpl.cc:88 msgid " executed" -msgstr "" +msgstr " spustenÃ½" # %s is either BOOTP or DHCP #: ../zypp/target/TargetImpl.cc:110 -#, fuzzy msgid " execution failed" -msgstr "KonfigurÃ¡cia pomocou %s zlyhala." +msgstr " spustenie zlyhalo" #: ../zypp/target/TargetImpl.cc:196 msgid " execution skipped while aborting" -msgstr "" +msgstr " spustenie odloÅ¾enÃ© kvÃ´li preruÅ¡eniu programu" #: ../zypp/solver/detail/SATResolver.cc:940 #, c-format @@ -98,7 +97,7 @@ #: ../zypp/VendorSupportOptions.cc:29 msgid "Additional Customer Contract Necessary" -msgstr "" +msgstr "Je potrebnÃ¡ ÄalÅ¡ia ZÃ¡kaznÃcka Zmluva" #. language code: ady #: ../zypp/LanguageCode.cc:248 @@ -197,7 +196,7 @@ #: ../zypp/VendorSupportOptions.cc:54 msgid "An additional customer contract is necessary for getting support." -msgstr "" +msgstr "Pre poskytovanie podpory je potrebnÃ¡ ÄalÅ¡ia zÃ¡kaznÃcka zmluva." # AD #: ../zypp/CountryCode.cc:224 @@ -749,7 +748,7 @@ #: ../zypp/media/MediaException.cc:273 #, c-format msgid "Cannot find available loop device to mount the image file from '%s'" -msgstr "" +msgstr "Neviem nÃ¡jsÅ¥ dostupnÃ© loop zariadenie na pripojenie sÃºboru '%s' s obrazom." #: ../zypp/media/MediaException.cc:67 #, c-format @@ -1133,9 +1132,9 @@ #. TranslatorExplanation: curl is the name of a library, don't translate #: ../zypp/media/MediaException.cc:92 ../zypp/media/MediaException.cc:100 -#, fuzzy, c-format +#, c-format msgid "Download (Metalink curl) initialization failed for '%s'" -msgstr "Zlyhala inicializÃ¡cia sÅ¥ahovania (curl) pre '%s'" +msgstr "Zlyhala inicializÃ¡cia sÅ¥ahovania (metalink curl) pre '%s'" #: ../zypp/media/MediaException.cc:168 #, c-format @@ -1155,13 +1154,13 @@ msgstr "Zlyhala inicializÃ¡cia sÅ¥ahovania (curl) pre '%s'" #: ../zypp/media/MediaException.cc:186 ../zypp/media/MediaException.cc:204 -#, fuzzy, c-format +#, c-format msgid "" "Download (metalink curl) error for '%s':\n" "Error code: %s\n" "Error message: %s\n" msgstr "" -"Chyba sÅ¥ahovania (curl) pre '%s':\n" +"Chyba sÅ¥ahovania (metalink curl) pre '%s':\n" "KÃ³d chyby: %s\n" "ChybovÃ¡ sprÃ¡va: %s\n" @@ -1294,9 +1293,9 @@ #. TranslatorExplanation: curl is the name of a library, don't translate #: ../zypp/media/MediaException.cc:195 ../zypp/media/MediaException.cc:213 -#, fuzzy, c-format +#, c-format msgid "Error occurred while setting download (metalink curl) options for '%s':" -msgstr "Vyskytla sa chyba poÄas nastavovania moÅ¾nostÃ sÅ¥ahovania (curl) pre '%s':" +msgstr "Vyskytla sa chyba poÄas nastavovania moÅ¾nostÃ sÅ¥ahovania (metalink curl) pre '%s':" # SY # fuzzy @@ -1790,7 +1789,7 @@ #: ../zypp/solver/detail/SATResolver.cc:922 msgid "Have you enabled all requested repositories?" -msgstr "" +msgstr "MÃ¡te zapnutÃ© vÅ¡etky poÅ¾adovanÃ© repozitÃ¡re?" #. language code: haw #: ../zypp/LanguageCode.cc:594 @@ -2405,15 +2404,15 @@ #: ../zypp/VendorSupportOptions.cc:20 msgid "Level 1" -msgstr "" +msgstr "ÃroveÅ 1" #: ../zypp/VendorSupportOptions.cc:23 msgid "Level 2" -msgstr "" +msgstr "ÃroveÅ 2" #: ../zypp/VendorSupportOptions.cc:26 msgid "Level 3" -msgstr "" +msgstr "ÃroveÅ 3" #. language code: lez #: ../zypp/LanguageCode.cc:744 @@ -3116,7 +3115,7 @@ #: ../zypp/parser/RepoindexFileReader.cc:116 #, c-format msgid "One or both of '%s' or '%s' attributes is required." -msgstr "" +msgstr "Jeden alebo oba z atribÃºtov '%s' alebo '%s' sÃº vyÅ¾adovanÃ©." #: ../zypp/media/MediaException.cc:161 msgid "Operation not supported by medium" @@ -3151,9 +3150,9 @@ #. TranslatorExplanation %s = package being checked for integrity #: ../zypp/repo/PackageProvider.cc:247 -#, fuzzy, c-format +#, c-format msgid "Package %s seems to be corrupted during transfer. Do you want to retry retrieval?" -msgstr "Kontrola integrity balÃka %s zlyhala. Chcete sa znova pokÃºsiÅ¥ o jeho stiahnutie?" +msgstr "BalÃk %s sa poÄas sÅ¥ahovania pravdepodobne poÅ¡kodil. Chcete sa znova pokÃºsiÅ¥ o jeho stiahnutie?" #. language code: pal #: ../zypp/LanguageCode.cc:926 @@ -3309,15 +3308,15 @@ #: ../zypp/VendorSupportOptions.cc:45 msgid "Problem determination, which means technical support designed to provide compatibility information, installation assistance, usage support, on-going maintenance and basic troubleshooting. Level 1 Support is not intended to correct product defect errors." -msgstr "" +msgstr "UrÄenie problÃ©mu, teda technickÃ¡ podpora zameranÃ¡ na poskytovanie informÃ¡ciÃ o kompatibilite, pomoc pri inÅ¡talÃ¡cii, pomoc pri pouÅ¾ÃvanÃ, nepretrÅ¾itÃº ÃºdrÅ¾bu a zÃ¡kladnÃº pomoc pri rieÅ¡enÃ problÃ©mov. Podpora Ãrovne 1 nie je urÄenÃ¡ na opravu chÃ½b produktu." #: ../zypp/VendorSupportOptions.cc:48 msgid "Problem isolation, which means technical support designed to duplicate customer problems, isolate problem area and provide resolution for problems not resolved by Level 1 Support." -msgstr "" +msgstr "IzolÃ¡cia problÃ©mu, teda technickÃ¡ podpora zameranÃ¡ na reprodukovanie problÃ©mov zÃ¡kaznÃka, vymedzenie problÃ©movej oblasti a poskytovanie rieÅ¡enia problÃ©mov nevyrieÅ¡enÃ½ch Podporou Ãrovne 1." #: ../zypp/VendorSupportOptions.cc:51 msgid "Problem resolution, which means technical support designed to resolve complex problems by engaging engineering in resolution of product defects which have been identified by Level 2 Support." -msgstr "" +msgstr "RieÅ¡enie problÃ©mu, teda technickÃ¡ podpora zameranÃ¡ na rieÅ¡enie zloÅ¾itÃ½ch problÃ©mov za pomoci odbornÃkov pri rieÅ¡enÃ chÃ½b produktu, ktorÃ© boli identifikovanÃ© Podporou Ãrovne 2." #. language code: pro #: ../zypp/LanguageCode.cc:956 @@ -3387,9 +3386,9 @@ msgstr "OdstraÅujem repozitÃ¡r '%s'" #: ../zypp/parser/RepoindexFileReader.cc:128 -#, fuzzy, c-format +#, c-format msgid "Required attribute '%s' is missing." -msgstr "ChÃ½ba vyÅ¾adovanÃ½ sÃºbor: " +msgstr "ChÃ½ba vyÅ¾adovanÃ½ atribÃºt '%s' ." # RE #. :QAT:634: @@ -3885,11 +3884,13 @@ msgstr "SystÃ©movÃ¡ vÃ½nimka '%s' na mÃ©diu '%s'." #: ../zypp/ZYppFactory.cc:361 -#, fuzzy, c-format +#, c-format msgid "" "System management is locked by the application with pid %d (%s).\n" "Close this application before trying again." -msgstr "SprÃ¡va softvÃ©ru je uzamknutÃ¡ inou aplikÃ¡ciou s pid-om %d. ProsÃm ukonÄite najprv tÃºto aplikÃ¡ciu neÅ¾ to skÃºsite znova." +msgstr "" +"SprÃ¡va softvÃ©ru je uzamknutÃ¡ inou aplikÃ¡ciou s pid-om %d (%s).\n" +"UkonÄite najprv tÃºto aplikÃ¡ciu a skÃºste znova." #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3968,12 +3969,11 @@ #: ../zypp/VendorSupportOptions.cc:39 msgid "The level of support is unspecified" -msgstr "" +msgstr "ÃroveÅ podpory nie je urÄenÃ½." #: ../zypp/VendorSupportOptions.cc:42 -#, fuzzy msgid "The vendor does not provide support." -msgstr "Disk neexistuje." +msgstr "DodÃ¡vateÄ¾ neposkytuje podporu." #: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." @@ -3982,7 +3982,7 @@ #: ../zypp/solver/detail/SATResolver.cc:1130 #: ../zypp/solver/detail/SATResolver.cc:1148 msgid "This request will break your system!" -msgstr "" +msgstr "Tento poÅ¾iadavok poruÅ¡Ã vÃ¡Å¡ systÃ©m!" #. language code: tib bod bo #: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 @@ -4228,9 +4228,8 @@ msgstr "SpojenÃ© Å tÃ¡ty Minor Outlying ostrovy" #: ../zypp/target/TargetImpl.cc:997 -#, fuzzy msgid "Unknown Distribution" -msgstr "NeznÃ¡ma voÄ¾ba " +msgstr "NeznÃ¡ma DistribÃºcia" #: ../zypp/CountryCode.cc:135 msgid "Unknown country: " @@ -4242,7 +4241,7 @@ #: ../zypp/VendorSupportOptions.cc:56 msgid "Unknown support option. Description not available" -msgstr "" +msgstr "NeznÃ¡my typ podpory. Popis nie je k dispozÃcii." #: ../zypp/media/MediaUserAuth.cc:123 #, c-format @@ -4584,7 +4583,7 @@ #: ../zypp/solver/detail/SATResolver.cc:1131 #: ../zypp/solver/detail/SATResolver.cc:1149 msgid "ignore the warning of a broken system" -msgstr "" +msgstr "ignorovaÅ¥ varovanie o poruÅ¡enÃ systÃ©mu" #: ../zypp/solver/detail/SATResolver.cc:1227 #, c-format @@ -4600,9 +4599,8 @@ " %s" #: ../zypp/VendorSupportOptions.cc:31 -#, fuzzy msgid "invalid" -msgstr "ChybnÃ¡ URL" +msgstr "chybnÃ½" #. for solver reason: NOT weak lock. #: ../zypp/solver/detail/SATResolver.cc:1073 @@ -4673,9 +4671,8 @@ "Tu je prvÃ½ch 25 riadkov rozdielov:\n" #: ../zypp/solver/detail/SATResolver.cc:918 -#, fuzzy msgid "some dependency problem" -msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s kvÃ´li problÃ©mom so zÃ¡vislosÅ¥ami" +msgstr "problÃ©m so zÃ¡vislosÅ¥ami" #: ../zypp/solver/detail/SATResolver.cc:995 msgid "uninstallable providers: " @@ -4687,244 +4684,5 @@ #: ../zypp/VendorSupportOptions.cc:17 msgid "unsupported" -msgstr "" - -#~ msgid "%s remove failed" -#~ msgstr "OdstrÃ¡nenie %s zlyhalo" - -#~ msgid "Additional rpm output:" -#~ msgstr "ÄalÅ¡Ã vÃ½stup prÃkazu rpm:" - -#~ msgid "Invalid user name or password." -#~ msgstr "NeplatnÃ© meno pouÅ¾ÃvateÄ¾a alebo heslo." - -#~ msgid "rpm output:" -#~ msgstr "VÃ½stup prÃkazu rpm:" - -#~ msgid "%s install failed" -#~ msgstr "InÅ¡talÃ¡cia %s zlyhala." - -#~ msgid "%s installed ok" -#~ msgstr "%s bol ÃºspeÅ¡ne nainÅ¡talovanÃ½" - -#~ msgid "%s remove ok" -#~ msgstr "%s bol ÃºspeÅ¡ne odstrÃ¡nenÃ½" - -#~ msgid "%s provides this dependency, but would change the architecture of the installed item" -#~ msgstr "%s poskytuje tÃºto zÃ¡vislosÅ¥, ale zmenil by architektÃºru nainÅ¡talovanÃ©ho systÃ©mu" - -#~ msgid "%s provides this dependency, but would change the vendor of the installed item" -#~ msgstr "%s poskytuje tÃºto zÃ¡vislosÅ¥, ale zmenil by dodÃ¡vateÄ¾a nainÅ¡talovanÃ©ho balÃka" - -#~ msgid "Do not install or delete the resolvables concerned" -#~ msgstr "NeinÅ¡taluj ani neodstraÅuj dotknutÃ© balÃky" - -#~ msgid "Ignore that %s is already set to install" -#~ msgstr "Ignoruj fakt, Å¾e %s je uÅ¾ oznaÄenÃ½ pre inÅ¡talÃ¡ciu" - -#~ msgid "Ignore the obsolete %s in %s" -#~ msgstr "Ignoruj nahradenÃ½ %s v %s" - -#~ msgid "Ignore this conflict of %s" -#~ msgstr "Ignoruj tento konflikt s balÃkom %s" - -#~ msgid "Ignore this requirement just here" -#~ msgstr "Ignoruj tÃºto poÅ¾iadavku len pre tento prÃpad" - -#~ msgid "Install %s although it would change the architecture" -#~ msgstr "NainÅ¡taluj %s, hoci to spÃ´sobÃ zmenu architektÃºry" - -#~ msgid "Install %s although it would change the vendor" -#~ msgstr "NainÅ¡taluj %s, hoci to spÃ´sobÃ zmenu dodÃ¡vateÄ¾a" - -#~ msgid "Install missing resolvables" -#~ msgstr "NainÅ¡taluj chÃ½bajÃºce balÃky" - -#~ msgid "Keep resolvables" -#~ msgstr "PonechaÅ¥ balÃky" - -#~ msgid "Unlock these resolvables" -#~ msgstr "Odomkni tieto balÃky" - -#~ msgid "delete %s" -#~ msgstr "odstrÃ¡niÅ¥ %s" - -#~ msgid "install %s" -#~ msgstr "nainÅ¡talovaÅ¥ %s" - -#~ msgid "unlock %s" -#~ msgstr "odomkni %s" - -#~ msgid "unlock all resolvables" -#~ msgstr "odomkni vÅ¡etky balÃky" - -#, fuzzy -#~ msgid "Can't open solv-file: " -#~ msgstr "NemÃ´Å¾em otvoriÅ¥ sÃºbor '%1'." - -#, fuzzy -#~ msgid "Error reading solv-file: " -#~ msgstr "Chyba pri ÄÃtanÃ repozitÃ¡rov:" - -#~ msgid "Path Parameter parsing not supported for this URL" -#~ msgstr "Path parametre nie sÃº pre tÃºto URL podporovanÃ©" - -#~ msgid "Path parameter parsing not supported for this URL" -#~ msgstr "Path parametre nie sÃº pre tÃºto URL podporovanÃ©" - -#~ msgid "Reading '%s' repository cache" -#~ msgstr "NaÄÃtavam medzipamÃ¤Å¥ pre repozitÃ¡r '%s'" - -#~ msgid "Reading patch and delta rpms from '%s' repository cache" -#~ msgstr "NaÄÃtavam informÃ¡cie o zÃ¡platÃ¡ch a delta rpm sÃºboroch z medzipamÃ¤te repozitÃ¡ra '%s'" - -#~ msgid "Cleaning repository '%s' cache" -#~ msgstr "ÄistÃm medzipamÃ¤Å¥ repozitÃ¡ra '%s'" - -#~ msgid "Reading repository '%s' cache" -#~ msgstr "NaÄÃtavam medzipamÃ¤Å¥ repozitÃ¡ra '%s'" - -#~ msgid "Software management is already running." -#~ msgstr "SprÃ¡va softvÃ©ru je uÅ¾ spustenÃ¡." - -#~ msgid "%s is replaced by %s" -#~ msgstr "%s je nahradenÃ© %s" - -#~ msgid "%s replaced by %s" -#~ msgstr "%s nahradenÃ© %s" - -#~ msgid "%s will be deleted by the user.\n" -#~ msgstr "%s bude ostrÃ¡nenÃ½ pouÅ¾ÃvateÄ¾om.\n" - -#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s bude odstrÃ¡nenÃ½ inou aplikÃ¡ciou. (ApplLow/ApplHigh)\n" - -#~ msgid "%s will be installed by the user.\n" -#~ msgstr "%s bude nainÅ¡talovanÃ½ pouÅ¾ÃvateÄ¾om.\n" - -#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s bude nainÅ¡talovanÃ½ inou aplikÃ¡ciou. (ApplLow/ApplHigh)\n" - -#~ msgid "No valid solution found within %d seconds" -#~ msgstr "PoÄas %d sekÃºnd nebolo nÃ¡jdenÃ© Å¾iadne platnÃ© rieÅ¡enie" - -#~ msgid "The solver has reached a defined timout" -#~ msgstr "Solver prekroÄil definovanÃ½ Äas" - -#~ msgid "No valid solution found with just resolvables of best architecture." -#~ msgstr "Len s objektami najvhodnejÅ¡ej architektÃºry nebolo nÃ¡jdenÃ© rieÅ¡enie." - -#~ msgid "With this run only resolvables with the best architecture have been regarded.\n" -#~ msgstr "Pri hÄ¾adanÃ rieÅ¡enia bolo v tomto behu uvaÅ¾ovanÃ© len s objektami s najvhodnejÅ¡ou architektÃºrou.\n" - -#~ msgid "Regarding all possible resolvables takes time, but can come to a valid result." -#~ msgstr "Pri uvaÅ¾ovanÃ vÅ¡etkÃ½ch moÅ¾nÃ½ch architektÃºr mÃ´Å¾e hÄ¾adanie trvaÅ¥ dlho, no mÃ´Å¾e viesÅ¥ k rieÅ¡eniu." - -#~ msgid "Invalid information" -#~ msgstr "NeplatnÃ¡ informÃ¡cia" - -#~ msgid "%s is needed by other resolvables" -#~ msgstr "%s je vyÅ¾adovanÃ½ inÃ½mi balÃkami" - -#~ msgid "" -#~ "%s is needed by:\n" -#~ "%s" -#~ msgstr "" -#~ "%s je vyÅ¾adovanÃ½ balÃkami:\n" -#~ "%s" - -#~ msgid "%s conflicts with other resolvables" -#~ msgstr "%s je v konflikte s inÃ½mi balÃkmi" - -#~ msgid "" -#~ "%s conflicts with:\n" -#~ "%s" -#~ msgstr "" -#~ "%s je v konflikte s:\n" -#~ "%s" - -#~ msgid "%s obsoletes other resolvables" -#~ msgstr "%s nahrÃ¡dza inÃ© balÃky" - -#~ msgid "%s obsoletes:%s" -#~ msgstr "%s nahradzuje: %s" - -#~ msgid "" -#~ "\n" -#~ "These resolvables will be deleted from the system." -#~ msgstr "" -#~ "\n" -#~ "Tieto balÃky budÃº zo systÃ©mu odstÃ¡nenÃ©." - -#~ msgid "%s depends on other resolvables" -#~ msgstr "%s zÃ¡visÃ na inÃ½ch balÃkoch" - -#~ msgid "%s depends on %s" -#~ msgstr "%s zÃ¡visÃ na %s" - -#~ msgid "%s depends on:%s" -#~ msgstr "%s zÃ¡visÃ na: %s" - -#~ msgid "Child of" -#~ msgstr "Potomok" - -#~ msgid "" -#~ "\n" -#~ "There is no resource available which supports this requirement." -#~ msgstr "" -#~ "\n" -#~ "Nie je k dispozÃcii Å¾iaden prostriedok, ktorÃ½ by mohol splniÅ¥ tento poÅ¾iadavok." - -#~ msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -#~ msgstr "KvÃ´li vyÅ¡Å¡ie/niÅ¾Å¡ie popÃsanÃ½m problÃ©mom nie je moÅ¾nÃ© vyrieÅ¡iÅ¥ vÅ¡etky zÃ¡vislosti" - -#~ msgid "Cannot install %s, because it is conflicting with %s" -#~ msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s pretoÅ¾e je v konflikte s %s" - -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "BalÃk %s nie je nainÅ¡talovanÃ½ a je oznaÄenÃ½ ako nenainÅ¡talovateÄ¾nÃ½" - -#~ msgid "%s has unfulfilled requirements" -#~ msgstr "%s mÃ¡ nesplnenÃ© poÅ¾iadavky" - -#~ msgid "%s has missing dependencies" -#~ msgstr "BalÃku %s chÃ½bajÃº zÃ¡vislÃ© balÃky" - -#~ msgid "%s cannot be installed due to missing dependencies" -#~ msgstr "%s nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ kvÃ´li chÃ½bajÃºcim zÃ¡vislostiam" - -#~ msgid "%s fulfills dependencies of %s but will be uninstalled" -#~ msgstr "%s spÄºÅa zÃ¡vislosti %s ale mÃ¡ byÅ¥ odinÅ¡talovanÃ½" - -#~ msgid "%s fulfills dependencies of %s but will be kept on your system" -#~ msgstr "%s spÄºÅa zÃ¡vislosti %s ale mÃ¡ byÅ¥ ponechanÃ½ v systÃ©me" - -#~ msgid "No need to install %s" -#~ msgstr "nie je potrebnÃ© inÅ¡talovaÅ¥ %s" - -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s aby splnil zÃ¡vislosti balÃka %s" - -#~ msgid "Cannot install %s to fulfil the dependencies of %s" -#~ msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s aby splnil zÃ¡vislosti balÃka %s" - -#~ msgid "%s will not be uninstalled, because it is still required" -#~ msgstr "%s nie je moÅ¾nÃ© odinÅ¡talovaÅ¥ pretoÅ¾e je stÃ¡le vyÅ¾adovanÃ½ inÃ½m balÃkom" - -#~ msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#~ msgstr "%s nahradzuje %s, ale %s nie je moÅ¾nÃ© odstrÃ¡niÅ¥ pretoÅ¾e je zamknutÃ½" - -#~ msgid "Cannot install %s, because it is conflicting" -#~ msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s lebo je v konflikte s inÃ½m balÃkom" - -#~ msgid "%s is uninstallable due to conflicts with %s" -#~ msgstr "%s nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ kvÃ´li konfliktom s %s" - -#~ msgid "Requirememt %s cannot be fulfilled." -#~ msgstr "Nie je moÅ¾nÃ© splniÅ¥ poÅ¾iadavku %s." - -#~ msgid "for requiring %s for %s when upgrading %s" -#~ msgstr "pre vyÅ¾adovanie %s pre %s kvÃ´li aktualizÃ¡cii %s" +msgstr "nepodporovanÃ½" -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "BalÃku %s chÃ½ba vyÅ¾adovanÃ½ balÃk %s" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11909 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: mlschroe Date: Mon Dec 8 19:13:17 2008 New Revision: 11909 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11909&view=rev Log: - also provide a reason for free decisions so that Klaus can display something Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1190… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Mon Dec 8 19:13:17 2008 @@ -364,23 +364,6 @@ d = dp[-1]; /* take single literal */ } -#if 0 - if (n == 0 && !solv->rpmrules_end) - { - /* this is a rpm rule assertion, we do not have to allocate it */ - /* it can be identified by a level of 1 and a zero reason */ - /* we must not drop those rules from the decisionq when rewinding! */ - assert(p < 0); - assert(solv->decisionmap[-p] == 0 || solv->decisionmap[-p] == -1); - if (solv->decisionmap[-p]) - return 0; /* already got that one */ - queue_push(&solv->decisionq, p); - queue_push(&solv->decisionq_why, 0); - solv->decisionmap[-p] = -1; - return 0; - } -#endif - if (n == 1 && p > d && !solv->rpmrules_end) { /* smallest literal first so we can find dups */ @@ -653,7 +636,7 @@ continue; } - assert(solv->decisionq_why.elements[i]); + assert(solv->decisionq_why.elements[i] > 0); /* * conflict with an rpm rule ? @@ -1934,7 +1917,7 @@ goto l1retry; } why = solv->decisionq_why.elements[idx]; - if (!why) /* just in case, maybe for SYSTEMSOLVABLE */ + if (why <= 0) /* just in case, maybe for SYSTEMSOLVABLE */ goto l1retry; c = solv->rules + why; } @@ -2107,6 +2090,7 @@ if (!MAPTST(&seen, vv)) continue; why = solv->decisionq_why.elements[idx]; + assert(why > 0); queue_push(&solv->learnt_pool, why); r = solv->rules + why; analyze_unsolvable_rule(solv, r, &lastweak); @@ -2254,13 +2238,14 @@ */ static int -setpropagatelearn(Solver *solv, int level, Id decision, int disablerules) +setpropagatelearn(Solver *solv, int level, Id decision, int disablerules, Id ruleid) { Pool *pool = solv->pool; Rule *r; Id p = 0, d = 0; int l, why; + assert(ruleid >= 0); if (decision) { level++; @@ -2269,7 +2254,7 @@ else solv->decisionmap[-decision] = -level; queue_push(&solv->decisionq, decision); - queue_push(&solv->decisionq_why, 0); + queue_push(&solv->decisionq_why, -ruleid); /* <= 0 -> free decision */ } for (;;) { @@ -2326,7 +2311,7 @@ */ static int -selectandinstall(Solver *solv, int level, Queue *dq, int disablerules) +selectandinstall(Solver *solv, int level, Queue *dq, int disablerules, Id ruleid) { Pool *pool = solv->pool; Id p; @@ -2359,7 +2344,7 @@ POOL_DEBUG(SAT_DEBUG_POLICY, "installing %s\n", solvable2str(pool, pool->solvables + p)); - return setpropagatelearn(solv, level, p, disablerules); + return setpropagatelearn(solv, level, p, disablerules, ruleid); } @@ -2567,7 +2552,7 @@ dq.count = k; } olevel = level; - level = selectandinstall(solv, level, &dq, disablerules); + level = selectandinstall(solv, level, &dq, disablerules, i); if (level == 0) { queue_free(&dq); @@ -2609,10 +2594,16 @@ if (solv->decisionmap[i] != 0) continue; + r = solv->rules + solv->updaterules + (i - solv->installed->start); + if (!r->p) /* update rule == feature rule? */ + r = r - solv->updaterules + solv->featurerules; + if (r->p && r->p != i) /* allowed to keep package? */ + continue; + POOL_DEBUG(SAT_DEBUG_PROPAGATE, "keeping %s\n", solvable2str(pool, s)); olevel = level; - level = setpropagatelearn(solv, level, i, disablerules); + level = setpropagatelearn(solv, level, i, disablerules, r->p ? r - solv->rules : 0); if (level == 0) /* unsolvable */ { @@ -2650,9 +2641,12 @@ p = dq.elements[0]; if (p != i && solv->decisionmap[p] == 0) { + r = solv->rules + solv->featurerules + (i - solv->installed->start); + if (!r->p) /* update rule == feature rule? */ + r = r - solv->featurerules + solv->updaterules; olevel = level; POOL_DEBUG(SAT_DEBUG_POLICY, "installing (multi-version) %s\n", solvable2str(pool, pool->solvables + p)); - level = setpropagatelearn(solv, level, p, disablerules); + level = setpropagatelearn(solv, level, p, disablerules, r->p ? r - solv->rules : 0); if (level == 0) { queue_free(&dq); @@ -2674,7 +2668,7 @@ { olevel = level; POOL_DEBUG(SAT_DEBUG_POLICY, "keeping (multi-version) %s\n", solvable2str(pool, pool->solvables + p)); - level = setpropagatelearn(solv, level, p, disablerules); + level = setpropagatelearn(solv, level, p, disablerules, r - solv->rules); if (level == 0) { queue_free(&dq); @@ -2728,7 +2722,7 @@ if (p || !dq.count) /* already fulfilled or empty */ continue; olevel = level; - level = selectandinstall(solv, level, &dq, disablerules); + level = selectandinstall(solv, level, &dq, disablerules, rr - solv->rules); if (level == 0) { queue_free(&dq); @@ -2821,7 +2815,7 @@ assert(dq.count > 1); olevel = level; - level = selectandinstall(solv, level, &dq, disablerules); + level = selectandinstall(solv, level, &dq, disablerules, r - solv->rules); if (level == 0) { queue_free(&dq); @@ -2947,7 +2941,7 @@ else POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); queue_push(&solv->recommendations, p); - level = setpropagatelearn(solv, level, p, 0); + level = setpropagatelearn(solv, level, p, 0, 0); continue; } @@ -2966,7 +2960,7 @@ POOL_DEBUG(SAT_DEBUG_POLICY, "installing supplemented %s\n", solvable2str(pool, pool->solvables + p)); queue_push(&solv->recommendations, p); olevel = level; - level = setpropagatelearn(solv, level, p, 0); + level = setpropagatelearn(solv, level, p, 0, 0); if (level <= olevel) break; } @@ -3017,7 +3011,7 @@ POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); queue_push(&solv->recommendations, p); olevel = level; - level = setpropagatelearn(solv, level, p, 0); + level = setpropagatelearn(solv, level, p, 0, 0); if (level <= olevel || solv->decisionq.count < decisioncount) break; } @@ -3043,7 +3037,7 @@ } POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); queue_push(&solv->recommendations, p); - level = setpropagatelearn(solv, level, p, 0); + level = setpropagatelearn(solv, level, p, 0, 0); continue; } #endif @@ -3065,12 +3059,12 @@ if (solv->distupgrade_removeunsupported) { POOL_DEBUG(SAT_DEBUG_STATS, "removing unsupported %s\n", solvable2str(pool, pool->solvables + p)); - level = setpropagatelearn(solv, level, -p, 0); + level = setpropagatelearn(solv, level, -p, 0, 0); } else { POOL_DEBUG(SAT_DEBUG_STATS, "keeping unsupported %s\n", solvable2str(pool, pool->solvables + p)); - level = setpropagatelearn(solv, level, p, 0); + level = setpropagatelearn(solv, level, p, 0, 0); } continue; } @@ -3083,6 +3077,8 @@ { int i = solv->branches.count - 1; int l = -solv->branches.elements[i]; + Id why; + for (; i > 0; i--) if (solv->branches.elements[i - 1] < 0) break; @@ -3098,7 +3094,9 @@ for (j = 0; j < dq.count; j++) queue_push(&solv->branches, dq.elements[j]); olevel = level; - level = setpropagatelearn(solv, level, p, disablerules); + why = -solv->decisionq_why.elements[solv->decisionq_why.count]; + assert(why >= 0); + level = setpropagatelearn(solv, level, p, disablerules, why); if (level == 0) { queue_free(&dq); @@ -3115,6 +3113,8 @@ if (solv->branches.count) { int l = 0, lasti = -1, lastl = -1; + Id why; + p = 0; for (i = solv->branches.count - 1; i >= 0; i--) { @@ -3137,8 +3137,10 @@ level = lastl; revert(solv, level); + why = -solv->decisionq_why.elements[solv->decisionq_why.count]; + assert(why >= 0); olevel = level; - level = setpropagatelearn(solv, level, p, disablerules); + level = setpropagatelearn(solv, level, p, disablerules, why); if (level == 0) { queue_free(&dq); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11908 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: mlandres Date: Mon Dec 8 15:34:41 2008 New Revision: 11908 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11908&view=rev Log: - Execute patch scripts chroot to the installed system. (bnc #456795) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11908&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Dec 8 15:34:41 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "6") +SET(LIBZYPP_PATCH "7") # # LAST RELEASED: 5.24.6 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Dec 8 15:34:41 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 8 15:31:18 CET 2008 - ma(a)suse.de + +- Execute patch scripts chroot to the installed system. (bnc #456795) +- revision 11908 + +------------------------------------------------------------------- Mon Dec 8 10:39:30 CET 2008 - schubi(a)suse.de - Make the solver reset function public (bnc #439373) Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Mon Dec 8 15:34:41 2008 @@ -86,7 +86,7 @@ HistoryLog historylog; historylog.comment(script_r.asString() + _(" executed"), /*timestamp*/true); - ExternalProgram prog( script_r.asString(), ExternalProgram::Stderr_To_Stdout, false, -1, true /*, root_r*/ ); + ExternalProgram prog( script_r.asString(), ExternalProgram::Stderr_To_Stdout, false, -1, true, root_r ); for ( std::string output = prog.receiveLine(); output.length(); output = prog.receiveLine() ) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11907 - /branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: schubi2 Date: Mon Dec 8 10:48:06 2008 New Revision: 11907 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11907&view=rev Log: Make solver reset public Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Mon Dec 8 10:48:06 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 8 10:47:33 CET 2008 - schubi(a)suse.de + +- Make the solver reset function public (bnc #439373) +- Revision 11906 + +------------------------------------------------------------------- Fri Dec 5 17:38:30 CET 2008 - ma(a)suse.de - Prune soft locks to prevent installation but not update of -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11906 - in /branches/SuSE-Linux-11_0-Branch/libzypp/zypp: Resolver.cc Resolver.h
by schubi2＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: schubi2 Date: Mon Dec 8 10:47:04 2008 New Revision: 11906 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11906&view=rev Log: Make solver reset public Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.cc branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.h Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.cc Mon Dec 8 10:47:04 2008 @@ -118,6 +118,8 @@ { return _pimpl->isInstalledBy (item); } const solver::detail::ItemCapKindList Resolver::installs (const PoolItem item) { return _pimpl->installs (item); } + void Resolver::reset () + { _pimpl->reset( false ); /* Do not keep extra requires/conflicts */ } ///////////////////////////////////////////////////////////////// Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.h (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Resolver.h Mon Dec 8 10:47:04 2008 @@ -103,6 +103,12 @@ */ void undo( void ); + /* + * Resets solver information and verify option. + */ + void reset( void ); + + /** * Do an distribution upgrade * -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11905 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: schubi2 Date: Mon Dec 8 10:41:52 2008 New Revision: 11905 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11905&view=rev Log: Make solver reset public Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Dec 8 10:41:52 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 8 10:39:30 CET 2008 - schubi(a)suse.de + +- Make the solver reset function public (bnc #439373) +- Revision 11904 + +------------------------------------------------------------------- Sun Dec 7 20:21:09 CET 2008 - coolo(a)suse.de - note for coolo: do not trust bash advisory from TPM colleagues -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11904 - in /trunk/libzypp/zypp: Resolver.cc Resolver.h
by schubi2＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: schubi2 Date: Mon Dec 8 10:40:52 2008 New Revision: 11904 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11904&view=rev Log: Make solver reset public Modified: trunk/libzypp/zypp/Resolver.cc trunk/libzypp/zypp/Resolver.h Modified: trunk/libzypp/zypp/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.cc?rev=119… ============================================================================== --- trunk/libzypp/zypp/Resolver.cc (original) +++ trunk/libzypp/zypp/Resolver.cc Mon Dec 8 10:40:52 2008 @@ -122,6 +122,8 @@ { return _pimpl->satifiedByInstalled (item); } const solver::detail::ItemCapKindList Resolver::installedSatisfied (const PoolItem item) { return _pimpl->installedSatisfied (item); } + void Resolver::reset () + { _pimpl->reset( false ); /* Do not keep extra requires/conflicts */ } Modified: trunk/libzypp/zypp/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.h?rev=1190… ============================================================================== --- trunk/libzypp/zypp/Resolver.h (original) +++ trunk/libzypp/zypp/Resolver.h Mon Dec 8 10:40:52 2008 @@ -103,6 +103,12 @@ */ void undo( void ); + /* + * Resets solver information and verify option. + */ + void reset( void ); + + /** * Do an distribution upgrade * -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0