Signed-off-by: Jakub Filak <[email protected]>
---
src/include/report.h | 5 ++++-
src/lib/report.c | 8 +-------
src/report-python/reportmodule.c | 3 ++-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/include/report.h b/src/include/report.h
index 21557ac..9100c7c 100644
--- a/src/include/report.h
+++ b/src/include/report.h
@@ -31,7 +31,8 @@ enum {
LIBREPORT_GETPID = (1 << 1), /* return pid of child. Use with
LIBREPORT_NOWAIT. */
/* Note: without LIBREPORT_GETPID, child
will be detached */
/* (reparented to init) */
- LIBREPORT_ANALYZE = (1 << 2), /* run analyzers? */
+ /* Deprecated option. Configure your events properly. */
+ /* LIBREPORT_ANALYZE = (1 << 2);*/ /* run analyzers? */
/* ("run reporters" is always on, has no
flag (for now?)) */
LIBREPORT_RELOAD_DATA = (1 << 5), /* reload problem data after run (needs
WAIT) */
LIBREPORT_DEL_DIR = (1 << 6), /* delete directory after reporting
(passes --delete to child) */
@@ -39,6 +40,8 @@ enum {
LIBREPORT_RUN_NEWT = (1 << 8), /* run 'report-newt' */
};
+
+
typedef enum {
LR_OK = 0,
LR_MISSING_ITEM = (1 << 1),
diff --git a/src/lib/report.c b/src/lib/report.c
index 09dbaac..7d7fbd6 100644
--- a/src/lib/report.c
+++ b/src/lib/report.c
@@ -44,8 +44,6 @@ int report_problem_in_dir(const char *dirname, int flags)
*pp++ = (char *)"report-gtk";
if (flags & LIBREPORT_DEL_DIR)
*pp++ = (char *)"--delete";
- if (!(flags & LIBREPORT_ANALYZE))
- *pp++ = (char *)"--report-only";
*pp++ = (char *)"--";
*pp++ = (char *)dirname;
*pp = NULL;
@@ -65,7 +63,6 @@ int report_problem_in_dir(const char *dirname, int flags)
*pp++ = (char *)"report-newt";
if (flags & LIBREPORT_DEL_DIR)
*pp++ = (char *)"--delete";
- *pp++ = (char *)"-o"; /* report only, newt can't analyze */
*pp++ = (char *)"--";
*pp++ = (char *)dirname;
*pp = NULL;
@@ -80,10 +77,7 @@ int report_problem_in_dir(const char *dirname, int flags)
*pp++ = (char *)"report-cli";
if (flags & LIBREPORT_DEL_DIR)
*pp++ = (char *)"--delete";
- if (!(flags & LIBREPORT_ANALYZE))
- *pp++ = (char *)"-ro"; /* only report */
- else
- *pp++ = (char *)"-r"; /* analyze and report */
+ *pp++ = (char *)"-r"; /* analyze and report */
*pp++ = (char *)"--";
*pp++ = (char *)dirname;
*pp = NULL;
diff --git a/src/report-python/reportmodule.c b/src/report-python/reportmodule.c
index 5fdb786..3f998b9 100644
--- a/src/report-python/reportmodule.c
+++ b/src/report-python/reportmodule.c
@@ -91,7 +91,8 @@ init_pyreport(void)
PyModule_AddObject(m, "LIBREPORT_NOWAIT" , Py_BuildValue("i",
LIBREPORT_NOWAIT ));
PyModule_AddObject(m, "LIBREPORT_WAIT" , Py_BuildValue("i",
LIBREPORT_WAIT ));
PyModule_AddObject(m, "LIBREPORT_GETPID" , Py_BuildValue("i",
LIBREPORT_GETPID ));
- PyModule_AddObject(m, "LIBREPORT_ANALYZE" , Py_BuildValue("i",
LIBREPORT_ANALYZE ));
+ /* Deprecated option. Configure your events properly. */
+ /* PyModule_AddObject(m, "LIBREPORT_ANALYZE" , Py_BuildValue("i",
LIBREPORT_ANALYZE )); */
PyModule_AddObject(m, "LIBREPORT_RELOAD_DATA", Py_BuildValue("i",
LIBREPORT_RELOAD_DATA));
PyModule_AddObject(m, "LIBREPORT_DEL_DIR" , Py_BuildValue("i",
LIBREPORT_DEL_DIR ));
PyModule_AddObject(m, "LIBREPORT_RUN_CLI" , Py_BuildValue("i",
LIBREPORT_RUN_CLI ));
--
1.7.10.2
