New upstream version 2.0.17preupstream/2.0.17pre

1 files changed, 17 insertions, 6 deletions

diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c
index e2f11cdf..218b4298 100644
--- a/hardinfo2/hardinfo.c
+++ b/hardinfo2/hardinfo.c
@@ -2,9 +2,9 @@
  *    HardInfo - Displays System Information
  *    Copyright (C) 2003-2009 L. A. F. Pereira <l@tia.mat.br>
  *
+ *
  *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2 or later.
+ *    it under the terms of the GNU General Public License v2.0 or later.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,6 +16,7 @@
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+
 #include <config.h>
 #include <shell.h>
 
@@ -58,16 +59,17 @@ int main(int argc, char **argv)
 
 	g_print(_("Compile-time options:\n"
 		"  Release version:   %s (%s)\n"
+		"  LibSoup version:   %s\n"
 		"  BinReloc enabled:  %s\n"
 		"  Data prefix:       %s\n"
 		"  Library prefix:    %s\n"
 		"  Compiled for:      %s\n"),
-		RELEASE ? _("Yes") : "No (" VERSION ")", ARCH,
+		RELEASE==1 ? "Yes (" VERSION ")" : (RELEASE==0?"No (" VERSION ")":"Debug (" VERSION ")"), ARCH,
+		HARDINFO2_LIBSOUP3 ? _("3.0") : "2.4",
 		ENABLE_BINRELOC ? _("Yes") : _("No"),
 		PREFIX, LIBPREFIX, PLATFORM);
 
-	DEBUG("  Debugging is enabled.");
-
+        return 0;
     }
 
     /* initialize the binreloc library, so we can load program data */
@@ -106,7 +108,7 @@ int main(int argc, char **argv)
 
         result = module_call_method_param("benchmark::runBenchmark", params.run_benchmark);
         if (!result) {
-          fprintf(stderr, _("Unknown benchmark ``%s''"), params.run_benchmark);
+          fprintf(stderr, _("Unknown benchmark ``%s''\n"), params.run_benchmark);
           exit_code = 1;
         } else {
           fprintf(stderr, "\n");
@@ -127,6 +129,10 @@ int main(int argc, char **argv)
 	/* generate report */
 	gchar *report;
 
+	if(params.bench_user_note) {//synchronize without sending benchmarks
+	    sync_manager_update_on_startup(0);
+	}
+
 	DEBUG("generating report");
 
 	report = report_create_from_module_list_format(modules,
@@ -134,6 +140,11 @@ int main(int argc, char **argv)
 						       report_format);
 	g_print("%s", report);
 
+	if(params.bench_user_note) {//synchronize
+	    if(!params.skip_benchmarks)
+	       sync_manager_update_on_startup(1);
+	}
+
 	g_free(report);
     } else {
         g_error(_("Don't know what to do. Exiting."));