myserver-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-47-g


From: Giuseppe Scrivano
Subject: [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-47-g4671efa
Date: Wed, 24 Feb 2010 21:29:38 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  4671efabcdb308d9286ca9b0925fe580239dfc90 (commit)
      from  01bfeea1ba67b0fb12599c7a8006416c3e8b8858 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 4671efabcdb308d9286ca9b0925fe580239dfc90
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Feb 24 22:05:55 2010 +0100

    Raise an error when the plugin data is not present

diff --git a/myserver/src/plugin/plugins_manager.cpp 
b/myserver/src/plugin/plugins_manager.cpp
index 55a6e63..935b560 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -288,6 +288,14 @@ PluginsManager::quickLoad (Server *server, const string 
&plugins)
       string xmlDescriptor = dir + "/plugin.xml";
       PluginInfo *pinfo = loadInfo (server, name, xmlDescriptor);
 
+      if (! pinfo)
+        {
+          server->log (MYSERVER_LOG_MSG_ERROR,
+                       _("Cannot find the plugin data, please check "
+                         "that the specified name and path are correct"));
+          return -1;
+        }
+
       auto_ptr<PluginInfo> pinfoAutoPtr (pinfo);
 
       ret |= loadFile (server, name, file, pinfo);

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/plugin/plugins_manager.cpp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer




reply via email to

[Prev in Thread] Current Thread [Next in Thread]