Author: lslezak Date: Fri Apr 11 15:07:46 2008 New Revision: 46410 URL: http://svn.opensuse.org/viewcvs/yast?rev=46410&view=rev Log: - fixed evaluation of StartProvide callback - fixed logging - improved remote source detection - 2.16.25 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Source_Load.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=46410&am... ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Apr 11 15:07:46 2008 @@ -1 +1 @@ -2.16.24 +2.16.25 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bi... ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Apr 11 15:07:46 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Apr 11 15:06:34 CEST 2008 - lslezak@suse.cz + +- fixed evaluation of StartProvide callback +- fixed logging +- improved remote source detection +- 2.16.25 + +------------------------------------------------------------------- Tue Apr 8 15:51:24 CEST 2008 - lslezak@suse.cz - return -1 when Pkg::SourceCreate() with non-empty product Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?rev... ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Fri Apr 11 15:07:46 2008 @@ -534,12 +534,14 @@ CB callback( ycpcb( YCPCallbacks::CB_StartProvide ) ); if (callback._set) { - bool remote = url.getScheme() != "cd" && url.getScheme() != "dvd" - && url.getScheme() != "nfs"; + std::string scheme = zypp::str::toLower(url.getScheme()); + + bool remote = scheme != "cd" && scheme != "dvd" && scheme != "nfs" && scheme != "dir" && scheme != "file"; + callback.addStr(resolvable_ptr->name()); callback.addInt( size ); callback.addBool(remote); - callback.evaluateBool(); + callback.evaluate(); } } Modified: trunk/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Load.cc?r... ============================================================================== --- trunk/pkg-bindings/src/Source_Load.cc (original) +++ trunk/pkg-bindings/src/Source_Load.cc Fri Apr 11 15:07:46 2008 @@ -236,7 +236,7 @@ { if (autorefresh_skipped) { - y2internal("autorefresh_skipped, ignoring the exception"); + y2warning("autorefresh_skipped, ignoring the exception"); } else { @@ -248,12 +248,12 @@ if (autorefresh_skipped) { - y2internal("Skipping autorefresh for the rest of repositories"); + y2warning("Skipping autorefresh for the rest of repositories"); break; } else { - y2internal("Continuing with autorefresh"); + y2debug("Continuing with autorefresh"); } } } @@ -294,7 +294,7 @@ // autorefresh the source if (raw_metadata_status.empty() ) { - y2internal("Missinga metadata, not rebuilding the cache"); + y2error("Missinga metadata, not rebuilding the cache"); continue; } } @@ -313,7 +313,7 @@ { if (autorefresh_skipped) { - y2internal("autorefresh_skipped, ignoring the exception"); + y2warning("autorefresh_skipped, ignoring the exception"); } else { @@ -325,12 +325,12 @@ if (autorefresh_skipped) { - y2internal("Skipping autorefresh for the rest of repositories"); + y2warning("Skipping autorefresh for the rest of repositories"); break; } else { - y2internal("Continuing with autorefresh"); + y2debug("Continuing with autorefresh"); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org