January 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r43256 - /trunk/pkg-bindings/src/
by lslezak＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: lslezak Date: Wed Jan 2 17:16:17 2008 New Revision: 43256 URL: http://svn.opensuse.org/viewcvs/yast?rev=43256&view=rev Log: - use simple logging function Modified: trunk/pkg-bindings/src/Callbacks.YCP.cc trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/src/Resolvable_Patches.cc trunk/pkg-bindings/src/Selection.cc trunk/pkg-bindings/src/Source_Create.cc trunk/pkg-bindings/src/Source_Get.cc trunk/pkg-bindings/src/Source_Installation.cc trunk/pkg-bindings/src/Source_Set.cc trunk/pkg-bindings/src/Target.cc trunk/pkg-bindings/src/Target_Load.cc trunk/pkg-bindings/src/Y2PkgFunction.cc Modified: trunk/pkg-bindings/src/Callbacks.YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.YCP.c… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.YCP.cc (original) +++ trunk/pkg-bindings/src/Callbacks.YCP.cc Wed Jan 2 17:16:17 2008 @@ -151,7 +151,7 @@ Y2Component *c = Y2ComponentBroker::getNamespaceComponent (module.c_str()); if (c == NULL) { - ycp2error ("No component can provide namespace %s for a callback of %s (callback id %d)", + y2error ("No component can provide namespace %s for a callback of %s (callback id %d)", module.c_str (), symbol.c_str (), id_r); return; } @@ -169,7 +169,7 @@ _cbdata[id_r].push (CBdata (module, symbol, ns)); } else { - ycp2error ("Callback must be a part of a namespace"); + y2error ("Callback must be a part of a namespace"); } } /** @@ -228,7 +228,7 @@ Y2Function* func = ns->createFunctionCall (name, Type::Unspec); // FIXME: here we can setup the type check if (func == NULL) { - ycp2error ("Cannot find function %s in module %s as a callback", name.c_str (), module.c_str()); + y2error ("Cannot find function %s in module %s as a callback", name.c_str (), module.c_str()); return NULL; } Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Wed Jan 2 17:16:17 2008 @@ -26,7 +26,7 @@ #include <string> #define y2log_component "Pkg" -#include <ycp/y2log.h> +#include <y2util/y2log.h> class YCPBoolean; class YCPValue; Modified: trunk/pkg-bindings/src/Resolvable_Patches.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Patc… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Patches.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Patches.cc Wed Jan 2 17:16:17 2008 @@ -117,8 +117,8 @@ // schedule for installation // but take the best edition. Bug #206927 { - stringstream str; - str << *i << endl; + std::ostringstream str; + str << *i << std::endl; y2milestone( "Setting '%s' to transact", str.str().c_str() ); // selected successfully - increase the counter selected_patches++; Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Wed Jan 2 17:16:17 2008 @@ -519,7 +519,7 @@ YCPValue PkgModuleFunctions::ClearSelection (const YCPString& selection) { - ycpwarning( "Pkg::ClearSelection does not reset add-on selections anymore"); + y2warning( "Pkg::ClearSelection does not reset add-on selections anymore"); return YCPBoolean( DoRemoveNameKind( selection->value(), zypp::ResTraits<zypp::Selection>::kind ) ); } Modified: trunk/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Create.c… ============================================================================== --- trunk/pkg-bindings/src/Source_Create.cc (original) +++ trunk/pkg-bindings/src/Source_Create.cc Wed Jan 2 17:16:17 2008 @@ -403,7 +403,7 @@ { if (aliasExists(alias)) { - ycperror("alias %s already exists", alias.c_str()); + y2error("alias %s already exists", alias.c_str()); return YCPVoid(); } } @@ -421,7 +421,7 @@ { if( ! lst->value(index)->isString() ) { - ycperror( "Pkg::RepositoryAdd(): entry not a string at index %d: %s", index, lst->toString().c_str()); + y2error( "Pkg::RepositoryAdd(): entry not a string at index %d: %s", index, lst->toString().c_str()); return YCPVoid(); } @@ -460,7 +460,7 @@ } else { - ycperror("Missing \"base_urls\" key in the map"); + y2error("Missing \"base_urls\" key in the map"); return YCPVoid(); } @@ -490,7 +490,7 @@ } catch (zypp::repo::RepoUnknownTypeException &e) { - ycperror("Unknown source type '%s': %s", type.c_str(), e.asString().c_str()); + y2error("Unknown source type '%s': %s", type.c_str(), e.asString().c_str()); _last_error.setLastError(ExceptionAsString(e)); return YCPVoid(); } Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Wed Jan 2 17:16:17 2008 @@ -33,6 +33,8 @@ #include <ycp/YCPMap.h> #include <ycp/YCPInteger.h> #include <ycp/YCPVoid.h> +#include <ycp/YCPString.h> +#include <ycp/YCPList.h> /* Textdomain "pkg-bindings" Modified: trunk/pkg-bindings/src/Source_Installation.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Installa… ============================================================================== --- trunk/pkg-bindings/src/Source_Installation.cc (original) +++ trunk/pkg-bindings/src/Source_Installation.cc Wed Jan 2 17:16:17 2008 @@ -31,6 +31,7 @@ #include <ycp/YCPBoolean.h> #include <ycp/YCPVoid.h> +#include <ycp/YCPString.h> /* Textdomain "pkg-bindings" Modified: trunk/pkg-bindings/src/Source_Set.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Set.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Set.cc (original) +++ trunk/pkg-bindings/src/Source_Set.cc Wed Jan 2 17:16:17 2008 @@ -148,7 +148,7 @@ { if( ! states->value(index)->isMap() ) { - ycperror( "Pkg::SourceEditSet, entry not a map at index %d", index); + y2error( "Pkg::SourceEditSet, entry not a map at index %d", index); error = true; continue; } @@ -157,7 +157,7 @@ if (descr->value( YCPString("SrcId") ).isNull() || !descr->value(YCPString("SrcId"))->isInteger()) { - ycperror( "Pkg::SourceEditSet, SrcId not defined for a source description at index %d", index); + y2error( "Pkg::SourceEditSet, SrcId not defined for a source description at index %d", index); error = true; continue; } @@ -167,7 +167,7 @@ YRepo_Ptr repo = logFindRepository(id); if (!repo) { - ycperror( "Pkg::SourceEditSet, source %d not found", index); + y2error( "Pkg::SourceEditSet, source %d not found", index); error = true; continue; } @@ -179,7 +179,7 @@ if (repo->repoInfo().enabled() != enable) { - ycpwarning("Pkg::SourceEditSet() does not refresh the pool (src: %zd, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled"); + y2warning("Pkg::SourceEditSet() does not refresh the pool (src: %zd, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled"); } y2debug("set enabled: %d", enable); Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Wed Jan 2 17:16:17 2008 @@ -66,7 +66,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetDisableSources has failed: %s", excpt.msg().c_str() ); + y2error("TargetDisableSources has failed: %s", excpt.msg().c_str() ); return YCPBoolean(false); } @@ -96,7 +96,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetInstall has failed: %s", excpt.asString().c_str()); + y2error("TargetInstall has failed: %s", excpt.asString().c_str()); return YCPBoolean(false); } @@ -125,7 +125,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetRemove has failed: %s", excpt.asString().c_str()); + y2error("TargetRemove has failed: %s", excpt.asString().c_str()); return YCPBoolean(false); } @@ -150,7 +150,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetLogfile has failed: %s", excpt.asString().c_str()); + y2error("TargetLogfile has failed: %s", excpt.asString().c_str()); return YCPBoolean(false); } return YCPBoolean (true); // never reached @@ -257,7 +257,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetRebuildDB has failed: %s", excpt.msg().c_str() ); + y2error("TargetRebuildDB has failed: %s", excpt.msg().c_str() ); return YCPBoolean(false); } Modified: trunk/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Target_Load.cc (original) +++ trunk/pkg-bindings/src/Target_Load.cc Wed Jan 2 17:16:17 2008 @@ -67,7 +67,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetInit has failed: %s", excpt.msg().c_str() ); + y2error("TargetInit has failed: %s", excpt.msg().c_str() ); return YCPError(excpt.msg().c_str(), YCPBoolean(false)); } @@ -97,7 +97,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetInit has failed: %s", excpt.msg().c_str() ); + y2error("TargetInit has failed: %s", excpt.msg().c_str() ); return YCPError(excpt.msg().c_str(), YCPBoolean(false)); } @@ -129,7 +129,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetLoad has failed: %s", excpt.msg().c_str() ); + y2error("TargetLoad has failed: %s", excpt.msg().c_str() ); return YCPError(excpt.msg().c_str(), YCPBoolean(false)); } @@ -155,7 +155,7 @@ catch (zypp::Exception & excpt) { _last_error.setLastError(ExceptionAsString(excpt)); - ycperror("TargetFinish has failed: %s", excpt.msg().c_str() ); + y2error("TargetFinish has failed: %s", excpt.msg().c_str() ); return YCPBoolean(false); } Modified: trunk/pkg-bindings/src/Y2PkgFunction.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Y2PkgFunction.c… ============================================================================== --- trunk/pkg-bindings/src/Y2PkgFunction.cc (original) +++ trunk/pkg-bindings/src/Y2PkgFunction.cc Wed Jan 2 17:16:17 2008 @@ -32,6 +32,8 @@ #include <ycp/YCPInteger.h> #include <ycp/YCPVoid.h> +#include <ycp/y2log.h> + Y2PkgFunction::Y2PkgFunction (string name, PkgModuleFunctions* instance, unsigned int pos) : m_position (pos) , m_instance (instance) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43255 - in /trunk/pkg-bindings/src: Callbacks.YCP.cc Callbacks.YCP.h PkgModuleFunctions.h
by lslezak＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: lslezak Date: Wed Jan 2 16:47:44 2008 New Revision: 43255 URL: http://svn.opensuse.org/viewcvs/yast?rev=43255&view=rev Log: - moved implementation details from Callbacks.YCP.h to Callbacks.YCP.cc Modified: trunk/pkg-bindings/src/Callbacks.YCP.cc trunk/pkg-bindings/src/Callbacks.YCP.h trunk/pkg-bindings/src/PkgModuleFunctions.h Modified: trunk/pkg-bindings/src/Callbacks.YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.YCP.c… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.YCP.cc (original) +++ trunk/pkg-bindings/src/Callbacks.YCP.cc Wed Jan 2 16:47:44 2008 @@ -22,6 +22,115 @@ #include "Callbacks.YCP.h" +#include <y2/Y2ComponentBroker.h> +#include <y2/Y2Component.h> + + /** + * Returns the enum name without the leading "CB_" + * (e.g. "StartProvide" for CB_StartProvide). Should + * be in sync with @ref CBid. + **/ + string PkgModuleFunctions::CallbackHandler::YCPCallbacks::cbName( CBid id_r ) { + switch ( id_r ) { +#define ENUM_OUT(N) case CB_##N: return #N + ENUM_OUT( StartRebuildDb ); + ENUM_OUT( ProgressRebuildDb ); + ENUM_OUT( NotifyRebuildDb ); + ENUM_OUT( StopRebuildDb ); + ENUM_OUT( StartConvertDb ); + ENUM_OUT( ProgressConvertDb ); + ENUM_OUT( NotifyConvertDb ); + ENUM_OUT( StopConvertDb ); + ENUM_OUT( StartScanDb ); + ENUM_OUT( ProgressScanDb ); + ENUM_OUT( ErrorScanDb ); + ENUM_OUT( DoneScanDb ); + + ENUM_OUT( StartProvide ); + ENUM_OUT( ProgressProvide ); + ENUM_OUT( DoneProvide ); + ENUM_OUT( StartPackage ); + ENUM_OUT( ProgressPackage ); + ENUM_OUT( DonePackage ); + ENUM_OUT( StartDownload ); + ENUM_OUT( ProgressDownload ); + ENUM_OUT( DoneDownload ); + ENUM_OUT( InitDownload ); + ENUM_OUT( DestDownload ); + + ENUM_OUT( ScriptStart ); + ENUM_OUT( ScriptProgress ); + ENUM_OUT( ScriptProblem ); + ENUM_OUT( ScriptFinish ); + ENUM_OUT( Message ); + + ENUM_OUT( Authentication ); + + ENUM_OUT( SourceCreateStart ); + ENUM_OUT( SourceCreateProgress ); + ENUM_OUT( SourceCreateError ); + ENUM_OUT( SourceCreateEnd ); + ENUM_OUT( SourceCreateInit ); + ENUM_OUT( SourceCreateDestroy ); + + ENUM_OUT( SourceProbeStart ); + ENUM_OUT( SourceProbeFailed ); + ENUM_OUT( SourceProbeSucceeded ); + ENUM_OUT( SourceProbeEnd ); + ENUM_OUT( SourceProbeProgress ); + ENUM_OUT( SourceProbeError ); + + ENUM_OUT( SourceReportStart ); + ENUM_OUT( SourceReportProgress ); + ENUM_OUT( SourceReportError ); + ENUM_OUT( SourceReportEnd ); + ENUM_OUT( SourceReportInit ); + ENUM_OUT( SourceReportDestroy ); + + ENUM_OUT( ProgressStart ); + ENUM_OUT( ProgressProgress ); + ENUM_OUT( ProgressDone ); + + ENUM_OUT( StartSourceRefresh ); + ENUM_OUT( ErrorSourceRefresh ); + ENUM_OUT( DoneSourceRefresh ); + ENUM_OUT( ProgressSourceRefresh ); + ENUM_OUT( StartDeltaDownload ); + ENUM_OUT( ProgressDeltaDownload ); + ENUM_OUT( ProblemDeltaDownload ); + ENUM_OUT( StartDeltaApply ); + ENUM_OUT( ProgressDeltaApply ); + ENUM_OUT( ProblemDeltaApply ); + ENUM_OUT( StartPatchDownload ); + ENUM_OUT( ProgressPatchDownload ); + ENUM_OUT( ProblemPatchDownload ); + ENUM_OUT( FinishDeltaDownload ); + ENUM_OUT( FinishDeltaApply ); + ENUM_OUT( FinishPatchDownload ); + ENUM_OUT( MediaChange ); + ENUM_OUT( SourceChange ); + ENUM_OUT( ResolvableReport ); + ENUM_OUT( ImportGpgKey ); + ENUM_OUT( AcceptNonTrustedGpgKey ); + ENUM_OUT( AcceptUnknownGpgKey ); + ENUM_OUT( AcceptUnsignedFile ); + ENUM_OUT( AcceptVerificationFailed ); + ENUM_OUT( AcceptFileWithoutChecksum ); + ENUM_OUT( TrustedKeyAdded ); + ENUM_OUT( TrustedKeyRemoved ); + ENUM_OUT( AcceptWrongDigest ); + ENUM_OUT( AcceptUnknownDigest ); + + ENUM_OUT( ProcessStart ); + ENUM_OUT( ProcessNextStage ); + ENUM_OUT( ProcessProgress ); + ENUM_OUT( ProcessFinished ); +#undef ENUM_OUT + // no default! let compiler warn missing values + } + return stringutil::form( "CBid(%d)", id_r ); + } + void PkgModuleFunctions::CallbackHandler::YCPCallbacks::popCallback( CBid id_r ) { _cbdata_t::iterator tmp1 = _cbdata.find(id_r); if (tmp1 != _cbdata.end() && !tmp1->second.empty()) Modified: trunk/pkg-bindings/src/Callbacks.YCP.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.YCP.h… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.YCP.h (original) +++ trunk/pkg-bindings/src/Callbacks.YCP.h Wed Jan 2 16:47:44 2008 @@ -28,8 +28,6 @@ //#include <y2util/Date.h> //#include <y2util/FSize.h> -#include <y2/Y2ComponentBroker.h> -#include <y2/Y2Component.h> #include <y2/Y2Namespace.h> #include <y2/Y2Function.h> @@ -116,107 +114,7 @@ * (e.g. "StartProvide" for CB_StartProvide). Should * be in sync with @ref CBid. **/ - static string cbName( CBid id_r ) { - switch ( id_r ) { -#define ENUM_OUT(N) case CB_##N: return #N - ENUM_OUT( StartRebuildDb ); - ENUM_OUT( ProgressRebuildDb ); - ENUM_OUT( NotifyRebuildDb ); - ENUM_OUT( StopRebuildDb ); - ENUM_OUT( StartConvertDb ); - ENUM_OUT( ProgressConvertDb ); - ENUM_OUT( NotifyConvertDb ); - ENUM_OUT( StopConvertDb ); - ENUM_OUT( StartScanDb ); - ENUM_OUT( ProgressScanDb ); - ENUM_OUT( ErrorScanDb ); - ENUM_OUT( DoneScanDb ); - - ENUM_OUT( StartProvide ); - ENUM_OUT( ProgressProvide ); - ENUM_OUT( DoneProvide ); - ENUM_OUT( StartPackage ); - ENUM_OUT( ProgressPackage ); - ENUM_OUT( DonePackage ); - ENUM_OUT( StartDownload ); - ENUM_OUT( ProgressDownload ); - ENUM_OUT( DoneDownload ); - ENUM_OUT( InitDownload ); - ENUM_OUT( DestDownload ); - - ENUM_OUT( ScriptStart ); - ENUM_OUT( ScriptProgress ); - ENUM_OUT( ScriptProblem ); - ENUM_OUT( ScriptFinish ); - ENUM_OUT( Message ); - - ENUM_OUT( Authentication ); - - ENUM_OUT( SourceCreateStart ); - ENUM_OUT( SourceCreateProgress ); - ENUM_OUT( SourceCreateError ); - ENUM_OUT( SourceCreateEnd ); - ENUM_OUT( SourceCreateInit ); - ENUM_OUT( SourceCreateDestroy ); - - ENUM_OUT( SourceProbeStart ); - ENUM_OUT( SourceProbeFailed ); - ENUM_OUT( SourceProbeSucceeded ); - ENUM_OUT( SourceProbeEnd ); - ENUM_OUT( SourceProbeProgress ); - ENUM_OUT( SourceProbeError ); - - ENUM_OUT( SourceReportStart ); - ENUM_OUT( SourceReportProgress ); - ENUM_OUT( SourceReportError ); - ENUM_OUT( SourceReportEnd ); - ENUM_OUT( SourceReportInit ); - ENUM_OUT( SourceReportDestroy ); - - ENUM_OUT( ProgressStart ); - ENUM_OUT( ProgressProgress ); - ENUM_OUT( ProgressDone ); - - ENUM_OUT( StartSourceRefresh ); - ENUM_OUT( ErrorSourceRefresh ); - ENUM_OUT( DoneSourceRefresh ); - ENUM_OUT( ProgressSourceRefresh ); - ENUM_OUT( StartDeltaDownload ); - ENUM_OUT( ProgressDeltaDownload ); - ENUM_OUT( ProblemDeltaDownload ); - ENUM_OUT( StartDeltaApply ); - ENUM_OUT( ProgressDeltaApply ); - ENUM_OUT( ProblemDeltaApply ); - ENUM_OUT( StartPatchDownload ); - ENUM_OUT( ProgressPatchDownload ); - ENUM_OUT( ProblemPatchDownload ); - ENUM_OUT( FinishDeltaDownload ); - ENUM_OUT( FinishDeltaApply ); - ENUM_OUT( FinishPatchDownload ); - ENUM_OUT( MediaChange ); - ENUM_OUT( SourceChange ); - ENUM_OUT( ResolvableReport ); - ENUM_OUT( ImportGpgKey ); - ENUM_OUT( AcceptNonTrustedGpgKey ); - ENUM_OUT( AcceptUnknownGpgKey ); - ENUM_OUT( AcceptUnsignedFile ); - ENUM_OUT( AcceptVerificationFailed ); - ENUM_OUT( AcceptFileWithoutChecksum ); - ENUM_OUT( TrustedKeyAdded ); - ENUM_OUT( TrustedKeyRemoved ); - ENUM_OUT( AcceptWrongDigest ); - ENUM_OUT( AcceptUnknownDigest ); - - ENUM_OUT( ProcessStart ); - ENUM_OUT( ProcessNextStage ); - ENUM_OUT( ProcessProgress ); - ENUM_OUT( ProcessFinished ); -#undef ENUM_OUT - // no default! let compiler warn missing values - } - return stringutil::form( "CBid(%d)", id_r ); - } - + static string cbName( CBid id_r ); private: struct CBdata Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Wed Jan 2 16:47:44 2008 @@ -41,10 +41,14 @@ #include <zypp/ZYpp.h> -class zypp::Pathname; -class zypp::Url; -class zypp::Arch; -class zypp::RepoInfo; +namespace zypp +{ + class Pathname; + class Url; + class Arch; + class RepoInfo; + class Locale; +} #include <zypp/DiskUsageCounter.h> #include <zypp/RepoManager.h> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43254 - /trunk/autoinstallation/src/modules/AutoinstScripts.ycp
by ug＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: ug Date: Wed Jan 2 15:41:25 2008 New Revision: 43254 URL: http://svn.opensuse.org/viewcvs/yast?rev=43254&view=rev Log: fix for pre-scripts in endless loop Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Wed Jan 2 15:41:25 2008 @@ -554,12 +554,11 @@ string executionString = ""; boolean showFeedback = s["feedback"]:false; - if (scriptInterpreter == "shell") { string debug = ( s["debug"]:true ? "-x" : "" ); - executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); y2milestone("Script Execution command: %1", executionString ); SCR::Execute (.target.bash, executionString); SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); @@ -568,8 +567,8 @@ else if (scriptInterpreter == "perl") { string debug = ( s["debug"]:true ? "-w" : "" ); - executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); y2milestone("Script Execution command: %1", executionString ); SCR::Execute (.target.bash, executionString); SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); @@ -577,8 +576,8 @@ } else if (scriptInterpreter == "python") { - executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName ); if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName ); y2milestone("Script Execution command: %1", executionString ); SCR::Execute (.target.bash, executionString); SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); @@ -589,11 +588,14 @@ y2error("Unknown interpreter: %1", scriptInterpreter); } string feedback = ""; - if( showFeedback ) { - feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); - } - if( size(feedback) > 0 ) { - Popup::LongText(type, `RichText(`opt(`plainText), feedback), 50, 20 ); + + if( executionString != "" ) { + if( showFeedback ) { + feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); + } + if( size(feedback) > 0 ) { + Popup::LongText(type, `RichText(`opt(`plainText), feedback), 50, 20 ); + } } } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43253 - /trunk/pkg-bindings/src/
by lslezak＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: lslezak Date: Wed Jan 2 14:56:50 2008 New Revision: 43253 URL: http://svn.opensuse.org/viewcvs/yast?rev=43253&view=rev Log: - code cleanup - removed unused includes Modified: trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Keyring.cc trunk/pkg-bindings/src/Locale.cc trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/Patch.cc trunk/pkg-bindings/src/PkgModuleFunctions.cc trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/src/PkgModuleFunctions_Register.cc trunk/pkg-bindings/src/PkgProgress.cc trunk/pkg-bindings/src/PkgProgress.h trunk/pkg-bindings/src/Resolvable_Install.cc trunk/pkg-bindings/src/Resolvable_Patches.cc trunk/pkg-bindings/src/Resolvable_Properties.cc trunk/pkg-bindings/src/Selection.cc trunk/pkg-bindings/src/Source_Callbacks.cc trunk/pkg-bindings/src/Source_Create.cc trunk/pkg-bindings/src/Source_Download.cc trunk/pkg-bindings/src/Source_Get.cc trunk/pkg-bindings/src/Source_Installation.cc trunk/pkg-bindings/src/Source_Load.cc trunk/pkg-bindings/src/Source_Misc.cc trunk/pkg-bindings/src/Source_Resolvables.cc trunk/pkg-bindings/src/Source_Save.cc trunk/pkg-bindings/src/Source_Set.cc trunk/pkg-bindings/src/Target.cc trunk/pkg-bindings/src/Target_DU.cc trunk/pkg-bindings/src/Target_Load.cc trunk/pkg-bindings/src/Y2PkgFunction.cc Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Wed Jan 2 14:56:50 2008 @@ -31,7 +31,6 @@ #include <zypp/ZYppCallbacks.h> #include <zypp/Package.h> -#include <zypp/Product.h> #include <zypp/KeyRing.h> #include <zypp/PublicKey.h> #include <zypp/Digest.h> Modified: trunk/pkg-bindings/src/Keyring.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Keyring.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Keyring.cc (original) +++ trunk/pkg-bindings/src/Keyring.cc Wed Jan 2 14:56:50 2008 @@ -22,11 +22,7 @@ #include <ycp/YCPVoid.h> #include <ycp/YCPBoolean.h> -#include <ycp/YCPInteger.h> -#include <ycp/YCPSymbol.h> #include <ycp/YCPString.h> -#include <ycp/YCPList.h> -#include <ycp/YCPMap.h> #include <zypp/KeyRing.h> Modified: trunk/pkg-bindings/src/Locale.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Locale.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Locale.cc (original) +++ trunk/pkg-bindings/src/Locale.cc Wed Jan 2 14:56:50 2008 @@ -23,7 +23,9 @@ #include "PkgModuleFunctions.h" -#include "Callbacks.h" +#include <ycp/YCPList.h> +#include <ycp/YCPString.h> +#include <ycp/YCPVoid.h> #include <zypp/Locale.h> @@ -175,7 +177,7 @@ * @usage Pkg::SetAdditionalLocales(["de_DE"]); */ YCPValue -PkgModuleFunctions::SetAdditionalLocales (YCPList langycplist) +PkgModuleFunctions::SetAdditionalLocales (const YCPList &langycplist) { zypp::ZYpp::LocaleSet lset; Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Jan 2 14:56:50 2008 @@ -37,10 +37,6 @@ #include <zypp/ResStatus.h> #include <zypp/ResPool.h> -#include <zypp/Package.h> -#include <zypp/Patch.h> -#include <zypp/SrcPackage.h> -#include <zypp/Product.h> #include <zypp/UpgradeStatistics.h> #include <zypp/target/rpm/RpmDb.h> #include <zypp/target/TargetException.h> Modified: trunk/pkg-bindings/src/Patch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Patch.cc?rev=43… ============================================================================== --- trunk/pkg-bindings/src/Patch.cc (original) +++ trunk/pkg-bindings/src/Patch.cc Wed Jan 2 14:56:50 2008 @@ -22,21 +22,9 @@ /-*/ -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <ycp/YCPVoid.h> -#include <ycp/YCPBoolean.h> -#include <ycp/YCPInteger.h> -#include <ycp/YCPSymbol.h> -#include <ycp/YCPString.h> -#include <ycp/YCPList.h> -#include <ycp/YCPMap.h> - -using std::string; -using std::endl; - - //------------------------------------------------------------- /** @@ -44,31 +32,10 @@ @short obsoleted, do not use @return map empty map */ -YCPMap +YCPValue PkgModuleFunctions::YouStatus () { - YCPMap result; - - /* TODO FIXME - result->add( YCPString( "error" ), YCPBoolean( false ) ); - - InstYou &you = _y2pm.youPatchManager().instYou(); - PMYouProductPtr product = you.settings()->primaryProduct(); - - if ( product ) - { - result->add( YCPString( "product" ), YCPString( product->product() ) ); - result->add( YCPString( "version" ), YCPString( product->version() ) ); - result->add( YCPString( "basearch" ), YCPString( product->baseArch() ) ); - result->add( YCPString( "business" ), YCPBoolean( product->businessProduct() ) ); - - result->add( YCPString( "mirrorurl" ), YCPString( product->youUrl() ) ); - } - result->add( YCPString( "lastupdate" ), YCPInteger( you.lastUpdate() ) ); - result->add( YCPString( "installedpatches" ), - YCPInteger( you.installedPatches() ) ); - */ - return result; + return YCPVoid(); } /** @@ -79,15 +46,7 @@ YCPValue PkgModuleFunctions::YouSetServer (const YCPMap& servers) { - /* TODO FIXME - PMYouServer server = convertServerObject( servers ); - - InstYou &you = _y2pm.youPatchManager().instYou(); - - you.settings()->setPatchServer( server ); - */ - - return YCPString( "" ); + return YCPVoid(); } @@ -99,14 +58,7 @@ YCPValue PkgModuleFunctions::YouGetUserPassword () { - /* TODO FIXME - InstYou &you = _y2pm.youPatchManager().instYou(); - - you.readUserPassword(); - */ - YCPMap result; - - return result; + return YCPVoid(); } /** @@ -117,23 +69,7 @@ YCPValue PkgModuleFunctions::YouSetUserPassword (const YCPString& user, const YCPString& passwd, const YCPBoolean& p) { - /* - TODO FIXME - string username = user->value_cstr(); - string password = passwd->value_cstr(); - bool persistent = p->value(); - - _last_error = - _y2pm.youPatchManager().instYou().setUserPassword( username, - password, - persistent ); - - if ( _last_error ) { - return YCPString( "error" ); - } - */ - - return YCPString(""); + return YCPVoid(); } // ------------------------ @@ -142,34 +78,10 @@ @short obsoleted, do not use @return string empty string */ -YCPString -PkgModuleFunctions::YouGetServers (YCPReference strings) +YCPValue +PkgModuleFunctions::YouGetServers (const YCPList&) { - /* TODO FIXME - std::list<PMYouServer> servers; - _last_error = _y2pm.youPatchManager().instYou().servers( servers ); - if ( _last_error ) { - if ( _last_error == YouError::E_get_youservers_failed ) return YCPString( "get" ); - if ( _last_error == YouError::E_write_youservers_failed ) return YCPString( "write" ); - if ( _last_error == YouError::E_read_youservers_failed ) return YCPString( "read" ); - return YCPString( "Error getting you servers." ); - } - - YCPList result = strings->entry ()->value ()->asList (); - std::list<PMYouServer>::const_iterator it; - for( it = servers.begin(); it != servers.end(); ++it ) { - YCPMap serverMap; - serverMap->add( YCPString( "url" ), YCPString( (*it).url().asString() ) ); - serverMap->add( YCPString( "name" ), YCPString( (*it).name() ) ); - serverMap->add( YCPString( "directory" ), YCPString( (*it).directory() ) ); - serverMap->add( YCPString( "type" ), YCPString( (*it).typeAsString() ) ); - result->add( serverMap ); - } - - strings->entry ()->setValue (result); -*/ - - return YCPString( "" ); + return YCPVoid(); } @@ -183,17 +95,7 @@ YCPValue PkgModuleFunctions::YouGetDirectory () { - /* TODO FIXME - InstYou &you = _y2pm.youPatchManager().instYou(); - - _last_error = you.retrievePatchDirectory(); - if ( _last_error ) { - if ( _last_error == MediaError::E_login_failed ) return YCPString( "login" ); - return YCPString( "error" ); - } - */ - - return YCPString( "" ); + return YCPVoid(); } /** @@ -204,24 +106,7 @@ YCPValue PkgModuleFunctions::YouRetrievePatchInfo (const YCPBoolean& download, const YCPBoolean& sig) { - - /* TODO FIXME - InstYou &you = _y2pm.youPatchManager().instYou(); - - you.settings()->setReloadPatches( reload ); - you.settings()->setCheckSignatures( checkSig ); - - _last_error = you.retrievePatchInfo(); - if ( _last_error ) { - if ( _last_error == MediaError::E_login_failed ) return YCPString( "login" ); - if ( _last_error.errClass() == PMError::C_MediaError ) return YCPString( "media" ); - if ( _last_error == YouError::E_bad_sig_file ) return YCPString( "sig" ); - if ( _last_error == YouError::E_user_abort ) return YCPString( "abort" ); - return YCPString( _last_error.errstr() ); - } - */ - - return YCPString( "" ); + return YCPVoid(); } /** @@ -232,11 +117,7 @@ YCPValue PkgModuleFunctions::YouProcessPatches () { - /* TODO FIXME - _last_error = _y2pm.youPatchManager().instYou().processPatches(); - if ( _last_error ) return YCPError( _last_error.errstr(), YCPBoolean( false ) ); - */ - return YCPBoolean( true ); + return YCPVoid(); } /** @@ -247,41 +128,9 @@ YCPValue PkgModuleFunctions::YouSelectPatches () { - /* TODO FIXME - int kinds = PMYouPatch::kind_security | PMYouPatch::kind_recommended | - PMYouPatch::kind_patchlevel; - - _y2pm.youPatchManager().instYou().selectPatches( kinds ); -*/ - return YCPVoid (); + return YCPVoid(); } -/* TODO FIXME -YCPMap -PkgModuleFunctions::YouPatch( const PMYouPatchPtr &patch ) -{ - - YCPMap result; - - result->add( YCPString( "kind" ), YCPString( patch->kindLabel( patch->kind() ) ) ); - result->add( YCPString( "name" ), YCPString( patch->name() ) ); - result->add( YCPString( "summary" ), YCPString( patch->shortDescription() ) ); - result->add( YCPString( "description" ), YCPString( patch->longDescription() ) ); - result->add( YCPString( "preinformation" ), YCPString( patch->preInformation() ) ); - result->add( YCPString( "postinformation" ), YCPString( patch->postInformation() ) ); - YCPList packageList; - std::list<PMPackagePtr> packages = patch->packages(); - std::list<PMPackagePtr>::const_iterator itPkg; - for ( itPkg = packages.begin(); itPkg != packages.end(); ++itPkg ) { - packageList->add( YCPString( (*itPkg)->nameEd() ) ); - } - - result->add( YCPString( "packages" ), packageList ); - - return result; -} -*/ - /** @builtin YouRemovePackages @short - obsoleted, do not use @@ -290,9 +139,5 @@ YCPValue PkgModuleFunctions::YouRemovePackages () { - /* TODO FIXME - _last_error = _y2pm.youPatchManager().instYou().removePackages(); - if ( _last_error ) return YCPError( _last_error.errstr(), YCPBoolean( false ) ); - */ - return YCPBoolean( true ); + return YCPVoid(); } Modified: trunk/pkg-bindings/src/PkgModuleFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.cc (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.cc Wed Jan 2 14:56:50 2008 @@ -260,3 +260,8 @@ } +YCPValue PkgModuleFunctions::evaluate (bool cse) +{ + if (cse) return YCPNull (); + else return YCPVoid (); +} Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Wed Jan 2 14:56:50 2008 @@ -24,30 +24,29 @@ #define PkgModuleFunctions_h #include <string> -#include <ycpTools.h> #define y2log_component "Pkg" #include <ycp/y2log.h> -#include <ycp/YCPBoolean.h> -#include <ycp/YCPValue.h> -#include <ycp/YCPList.h> -#include <ycp/YCPMap.h> -#include <ycp/YCPSymbol.h> -#include <ycp/YCPString.h> -#include <ycp/YCPInteger.h> -#include <ycp/YCPVoid.h> -#include <ycp/YBlock.h> +class YCPBoolean; +class YCPValue; +class YCPList; +class YCPMap; +class YCPSymbol; +class YCPString; +class YCPInteger; +class YCPVoid; #include <y2/Y2Namespace.h> #include <zypp/ZYpp.h> -#include <zypp/base/PtrTypes.h> -#include <zypp/Pathname.h> -#include <zypp/Url.h> -#include <zypp/Arch.h> + +class zypp::Pathname; +class zypp::Url; +class zypp::Arch; +class zypp::RepoInfo; + #include <zypp/DiskUsageCounter.h> -#include <zypp/RepoInfo.h> #include <zypp/RepoManager.h> #include <zypp/ProgressData.h> @@ -55,7 +54,6 @@ #include <i18n.h> #include "PkgError.h" -//#include "PkgProgress.h" class PkgProgress; /** @@ -204,7 +202,7 @@ /* TYPEINFO: string() */ YCPValue GetPackageLocale(); /* TYPEINFO: void(list<string>) */ - YCPValue SetAdditionalLocales (YCPList args); + YCPValue SetAdditionalLocales (const YCPList &args); /* TYPEINFO: list<string>() */ YCPValue GetAdditionalLocales (); /* TYPEINFO: string() */ @@ -656,9 +654,9 @@ // you patch related /* TYPEINFO: map<any,any>()*/ - YCPMap YouStatus (); - /* TYPEINFO: string(list<any>&)*/ - YCPString YouGetServers (YCPReference strings); + YCPValue YouStatus (); + /* TYPEINFO: string(list)*/ + YCPValue YouGetServers (const YCPList &strings); /* TYPEINFO: string(map<any,any>)*/ YCPValue YouSetServer (const YCPMap& strings); /* TYPEINFO: map<any,any>()*/ @@ -736,11 +734,7 @@ return "// not possible toString"; } - virtual YCPValue evaluate (bool cse = false ) - { - if (cse) return YCPNull (); - else return YCPVoid (); - } + virtual YCPValue evaluate (bool cse = false ); virtual Y2Function* createFunctionCall (const string name, constFunctionTypePtr type); }; Modified: trunk/pkg-bindings/src/PkgModuleFunctions_Register.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions_Register.cc (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions_Register.cc Wed Jan 2 14:56:50 2008 @@ -1,4 +1,14 @@ + +#include <ycp/YCPBoolean.h> +#include <ycp/YCPValue.h> +#include <ycp/YCPList.h> +#include <ycp/YCPMap.h> +#include <ycp/YCPSymbol.h> +#include <ycp/YCPString.h> +#include <ycp/YCPInteger.h> +#include <ycp/YCPVoid.h> + #include "PkgModuleFunctions.h" void PkgModuleFunctions::registerFunctions() Modified: trunk/pkg-bindings/src/PkgProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.cc?… ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.cc (original) +++ trunk/pkg-bindings/src/PkgProgress.cc Wed Jan 2 14:56:50 2008 @@ -1,8 +1,7 @@ -#include "PkgProgress.h" -#include <Callbacks.YCP.h> +#include "PkgProgress.h" #include <y2/Y2Function.h> Modified: trunk/pkg-bindings/src/PkgProgress.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.h?r… ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.h (original) +++ trunk/pkg-bindings/src/PkgProgress.h Wed Jan 2 14:56:50 2008 @@ -10,9 +10,11 @@ #include <string> #include <list> +//class PkgModuleFunctions::CallbackHandler; #include <PkgModuleFunctions.h> #include <Callbacks.YCP.h> + #include <zypp/ProgressData.h> #include <boost/bind.hpp> Modified: trunk/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Inst… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Install.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Install.cc Wed Jan 2 14:56:50 2008 @@ -29,17 +29,8 @@ #include <ycp/YCPVoid.h> #include <ycp/YCPBoolean.h> -#include <ycp/YCPInteger.h> #include <ycp/YCPSymbol.h> #include <ycp/YCPString.h> -#include <ycp/YCPList.h> -#include <ycp/YCPMap.h> - -#include <zypp/Product.h> -#include <zypp/Patch.h> -#include <zypp/Pattern.h> -#include <zypp/Language.h> -#include <zypp/Package.h> /** @builtin ResolvableInstallArchVersion Modified: trunk/pkg-bindings/src/Resolvable_Patches.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Patc… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Patches.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Patches.cc Wed Jan 2 14:56:50 2008 @@ -30,18 +30,10 @@ #include <sstream> #include <ycp/YCPVoid.h> -#include <ycp/YCPBoolean.h> #include <ycp/YCPInteger.h> #include <ycp/YCPSymbol.h> -#include <ycp/YCPString.h> -#include <ycp/YCPList.h> -#include <ycp/YCPMap.h> -#include <zypp/Product.h> #include <zypp/Patch.h> -#include <zypp/Pattern.h> -#include <zypp/Language.h> -#include <zypp/Package.h> /** @builtin ResolvableCountPatches Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Wed Jan 2 14:56:50 2008 @@ -27,7 +27,6 @@ #include "PkgModuleFunctions.h" -#include <ycp/YCPVoid.h> #include <ycp/YCPBoolean.h> #include <ycp/YCPInteger.h> #include <ycp/YCPSymbol.h> @@ -38,8 +37,8 @@ #include <zypp/Product.h> #include <zypp/Patch.h> #include <zypp/Pattern.h> -#include <zypp/Language.h> #include <zypp/Package.h> + #include <zypp/Dep.h> #include <zypp/CapSet.h> Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Wed Jan 2 14:56:50 2008 @@ -24,10 +24,8 @@ #include <fstream> -#include <PkgModule.h> #include <PkgModuleFunctions.h> -#include <ycp/YCPVoid.h> #include <ycp/YCPBoolean.h> #include <ycp/YCPInteger.h> #include <ycp/YCPSymbol.h> @@ -37,14 +35,11 @@ #include <zypp/ResPool.h> #include <zypp/ResTraits.h> -#include <zypp/Resolvable.h> #include <zypp/Selection.h> #include <zypp/Pattern.h> using std::string; - - // ------------------------ /** @builtin GetSelections Modified: trunk/pkg-bindings/src/Source_Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Callback… ============================================================================== --- trunk/pkg-bindings/src/Source_Callbacks.cc (original) +++ trunk/pkg-bindings/src/Source_Callbacks.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> /* Modified: trunk/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Create.c… ============================================================================== --- trunk/pkg-bindings/src/Source_Create.cc (original) +++ trunk/pkg-bindings/src/Source_Create.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <PkgProgress.h> Modified: trunk/pkg-bindings/src/Source_Download.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Download… ============================================================================== --- trunk/pkg-bindings/src/Source_Download.cc (original) +++ trunk/pkg-bindings/src/Source_Download.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <PkgProgress.h> Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Wed Jan 2 14:56:50 2008 @@ -25,14 +25,15 @@ Namespace: Pkg */ -#include <Callbacks.h> -#include <Callbacks.YCP.h> - -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <zypp/Product.h> +#include <ycp/YCPBoolean.h> +#include <ycp/YCPMap.h> +#include <ycp/YCPInteger.h> +#include <ycp/YCPVoid.h> + /* Textdomain "pkg-bindings" */ Modified: trunk/pkg-bindings/src/Source_Installation.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Installa… ============================================================================== --- trunk/pkg-bindings/src/Source_Installation.cc (original) +++ trunk/pkg-bindings/src/Source_Installation.cc Wed Jan 2 14:56:50 2008 @@ -25,14 +25,13 @@ Namespace: Pkg */ -#include <Callbacks.h> -#include <Callbacks.YCP.h> - -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <zypp/ExternalProgram.h> +#include <ycp/YCPBoolean.h> +#include <ycp/YCPVoid.h> + /* Textdomain "pkg-bindings" */ Modified: trunk/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Load.cc (original) +++ trunk/pkg-bindings/src/Source_Load.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <PkgProgress.h> Modified: trunk/pkg-bindings/src/Source_Misc.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Misc.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Misc.cc (original) +++ trunk/pkg-bindings/src/Source_Misc.cc Wed Jan 2 14:56:50 2008 @@ -25,10 +25,6 @@ Namespace: Pkg */ -#include <Callbacks.h> -#include <Callbacks.YCP.h> - -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <sstream> // ostringstream Modified: trunk/pkg-bindings/src/Source_Resolvables.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Resolvab… ============================================================================== --- trunk/pkg-bindings/src/Source_Resolvables.cc (original) +++ trunk/pkg-bindings/src/Source_Resolvables.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <PkgProgress.h> Modified: trunk/pkg-bindings/src/Source_Save.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Save.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Save.cc (original) +++ trunk/pkg-bindings/src/Source_Save.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <PkgProgress.h> Modified: trunk/pkg-bindings/src/Source_Set.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Set.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Set.cc (original) +++ trunk/pkg-bindings/src/Source_Set.cc Wed Jan 2 14:56:50 2008 @@ -28,7 +28,6 @@ #include <Callbacks.h> #include <Callbacks.YCP.h> -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <PkgProgress.h> Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Wed Jan 2 14:56:50 2008 @@ -22,7 +22,6 @@ /-*/ -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <ycp/YCPVoid.h> Modified: trunk/pkg-bindings/src/Target_DU.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_DU.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Target_DU.cc (original) +++ trunk/pkg-bindings/src/Target_DU.cc Wed Jan 2 14:56:50 2008 @@ -25,13 +25,11 @@ Namespace: Pkg */ -#include <PkgModule.h> #include <PkgModuleFunctions.h> #include <ycp/YCPVoid.h> #include <ycp/YCPBoolean.h> #include <ycp/YCPInteger.h> -#include <ycp/YCPSymbol.h> #include <ycp/YCPString.h> #include <ycp/YCPList.h> #include <ycp/YCPMap.h> Modified: trunk/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Target_Load.cc (original) +++ trunk/pkg-bindings/src/Target_Load.cc Wed Jan 2 14:56:50 2008 @@ -25,18 +25,11 @@ Namespace: Pkg */ -#include <PkgModule.h> #include <PkgModuleFunctions.h> -#include <ycp/YCPVoid.h> #include <ycp/YCPBoolean.h> -#include <ycp/YCPInteger.h> -#include <ycp/YCPSymbol.h> #include <ycp/YCPString.h> -#include <ycp/YCPList.h> -#include <ycp/YCPMap.h> -#include <zypp/Target.h> #include "PkgProgress.h" #include <HelpTexts.h> Modified: trunk/pkg-bindings/src/Y2PkgFunction.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Y2PkgFunction.c… ============================================================================== --- trunk/pkg-bindings/src/Y2PkgFunction.cc (original) +++ trunk/pkg-bindings/src/Y2PkgFunction.cc Wed Jan 2 14:56:50 2008 @@ -23,6 +23,15 @@ #include "Y2PkgFunction.h" +#include <ycp/YCPBoolean.h> +#include <ycp/YCPValue.h> +#include <ycp/YCPList.h> +#include <ycp/YCPMap.h> +#include <ycp/YCPSymbol.h> +#include <ycp/YCPString.h> +#include <ycp/YCPInteger.h> +#include <ycp/YCPVoid.h> + Y2PkgFunction::Y2PkgFunction (string name, PkgModuleFunctions* instance, unsigned int pos) : m_position (pos) , m_instance (instance) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43252 - /tags/stable-2_15_5/nfs-server/
by mvidner＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: mvidner Date: Wed Jan 2 14:06:32 2008 New Revision: 43252 URL: http://svn.opensuse.org/viewcvs/yast?rev=43252&view=rev Log: Created tag stable-2_15_5 for nfs-server Added: tags/stable-2_15_5/nfs-server/ - copied from r43251, trunk/nfs-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43251 - in /trunk/nfs-server: ./ VERSION package/yast2-nfs-server.changes src/NfsServer.ycp testsuite/tests/readwrite-unfsd.out testsuite/tests/readwrite.out testsuite/tests/readwrite2.out
by mvidner＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: mvidner Date: Wed Jan 2 13:53:37 2008 New Revision: 43251 URL: http://svn.opensuse.org/viewcvs/yast?rev=43251&view=rev Log: Merged revisions 37001-43249 via svnmerge from http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/nfs-server ........ r37002 | mvidner | 2007-03-16 11:37:16 +0100 (Pá, 16 bře 2007) | 5 lines reverted changes that are too late for the service pack now. :-( they are in the trunk instead. svn merge -r37000:36510 . ........ r37311 | mvidner | 2007-04-04 18:00:57 +0200 (St, 04 dub 2007) | 3 lines Do not pop up an error about idmapd during autoinstallation (#260723). ........ r37312 | mvidner | 2007-04-04 18:14:22 +0200 (St, 04 dub 2007) | 2 lines adjusted test cases ........ r37313 | mvidner | 2007-04-04 18:22:57 +0200 (St, 04 dub 2007) | 2 lines adjusted test cases... really ........ r39403 | mvidner | 2007-07-13 16:14:37 +0200 (Pá, 13 čec 2007) | 4 lines Do not call SCR at variable initialization. (Readded the appropriate half of r36930) (Preparing to fix #260723) ........ r39425 | mvidner | 2007-07-16 13:06:56 +0200 (Po, 16 čec 2007) | 3 lines Do not touch NFS4 during autoinstallation; really fixing "Unable to write idmapd.conf" (#260723). ........ Modified: trunk/nfs-server/ (props changed) trunk/nfs-server/VERSION trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/NfsServer.ycp trunk/nfs-server/testsuite/tests/readwrite-unfsd.out trunk/nfs-server/testsuite/tests/readwrite.out trunk/nfs-server/testsuite/tests/readwrite2.out Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=43251&r1=… ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Wed Jan 2 13:53:37 2008 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Wed Jan 2 13:53:37 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 2 13:34:33 CET 2008 - mvidner(a)suse.cz + +- Do not touch NFS4 during autoinstallation; really fixing "Unable to + write idmapd.conf" (#287338). +- Do not pop up an error about idmapd during autoinstallation + (#260723). + +------------------------------------------------------------------- Mon Aug 20 14:17:18 CEST 2007 - mvidner(a)suse.cz - Require nfs-kernel-server.rpm because nfs-utils.rpm got split (#286300). Modified: trunk/nfs-server/src/NfsServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev… ============================================================================== --- trunk/nfs-server/src/NfsServer.ycp (original) +++ trunk/nfs-server/src/NfsServer.ycp Wed Jan 2 13:53:37 2008 @@ -25,7 +25,6 @@ import "Summary"; import "SuSEFirewall"; import "Wizard"; - import "Popup"; /* default value of settings modified */ @@ -139,7 +138,11 @@ ``{ start = settings["start_nfsserver"]:false; exports = settings["nfs_exports"]:[]; - return; + // #260723, #287338: fix wrongly initialized variables + // but do not extend the schema yet + enable_nfsv4 = false; + domain = ""; + nfs_security = false; } @@ -254,6 +257,10 @@ if(enable_nfsv4) { SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"yes"); + if( !( SCR::Write(.etc.idmapd_conf,["Domain",(string)domain]) ) ) + { + Report::Error(_("Unable to write to idmapd.conf.")); + } } else { @@ -268,14 +275,8 @@ { SCR::Write(.sysconfig.nfs.NFS_SECURITY_GSS,"no"); } - SCR::Write(.sysconfig.nfs,nil); - if( !( SCR::Write(.etc.idmapd_conf,["Domain",(string)domain]) ) ) - { - Popup::Message(_("Unable to write to idmapd.conf.")); - } - Progress::NextStage (); if (!start) Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite-unfsd.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.out Wed Jan 2 13:53:37 2008 @@ -21,7 +21,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Modified: trunk/nfs-server/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite.out Wed Jan 2 13:53:37 2008 @@ -21,7 +21,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Modified: trunk/nfs-server/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite2.out Wed Jan 2 13:53:37 2008 @@ -25,7 +25,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true @@ -67,7 +66,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true @@ -126,7 +124,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true @@ -167,7 +164,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Write .etc.idmapd_conf ["Domain", ""] true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true Read .init.scripts.exists "portmap" true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43250 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstScripts.ycp
by ug＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: ug Date: Wed Jan 2 13:27:25 2008 New Revision: 43250 URL: http://svn.opensuse.org/viewcvs/yast?rev=43250&view=rev Log: endless loop in pre-script fixed (#351103) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jan 2 13:27:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 2 13:24:05 CET 2008 - ug(a)suse.de + +- endless loop in pre-script fixed (#351103) + +------------------------------------------------------------------- Fri Dec 7 11:47:42 CET 2007 - ug(a)suse.de - 2.16.3 Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Wed Jan 2 13:27:25 2008 @@ -559,21 +559,30 @@ { string debug = ( s["debug"]:true ? "-x" : "" ); executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); - y2milestone("Script Execution command: %1", executionString ); - SCR::Execute (.target.bash, executionString); + if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + y2milestone("Script Execution command: %1", executionString ); + SCR::Execute (.target.bash, executionString); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } else if (scriptInterpreter == "perl") { string debug = ( s["debug"]:true ? "-w" : "" ); executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); - y2milestone("Script Execution command: %1", executionString ); - SCR::Execute (.target.bash, executionString); + if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + y2milestone("Script Execution command: %1", executionString ); + SCR::Execute (.target.bash, executionString); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } else if (scriptInterpreter == "python") { executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName ); - y2milestone("Script Execution command: %1", executionString ); - SCR::Execute (.target.bash, executionString); + if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) { + y2milestone("Script Execution command: %1", executionString ); + SCR::Execute (.target.bash, executionString); + SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]); + } } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0