Merge pull request #3 from jsuchome/Code-11-SP3

- added option to include additional logs (bnc#806924)

.gitignore

@@ -0,0 +1,32 @@
+Makefile
+/Makefile.am
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.in
+depcomp
+install-sh
+*.pot
+libtool
+ltconfig
+ltmain.sh
+missing
+mkinstalldirs
+stamp-h*
+Makefile.am.common
+*.ami
+*.bz2
+*.spec
+.dep
+tmp.*
+*.log
+*.ybc
+POTFILES

VERSION

@@ -1 +1 @@
-2.17.19
+2.17.20

package/yast2-support.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 19 11:30:02 CEST 2013 - jsuchome@suse.cz
+
+- added option to include additional logs (bnc#806924)
+- 2.17.20 
+
 -------------------------------------------------------------------
 Mon Jan 18 09:51:55 CET 2010 - mzugec@suse.cz
 

src/Support.ycp

@@ -198,6 +198,7 @@ global boolean full_logging=false;
 global boolean minimal_logs=false;
 global boolean include_slp=false;
 global boolean rpm_check=false;
+global boolean additional_logs  =false;
 global string novell_number="";
 
 global map<string, any> log_files=$[];
@@ -215,6 +216,7 @@ global string GetParameterList(){
  if(minimal_logs)	parameters=sformat("%1 %2", parameters, "-m");
  if(include_slp)	parameters=sformat("%1 %2", parameters, "-s");
  if(rpm_check)		parameters=sformat("%1 %2", parameters, "-v");
+ if(additional_logs)    parameters=sformat("%1 %2", parameters, "-l");
  if( size(novell_number)>0 )	parameters=sformat("%1 %2 %3", parameters, "-r", novell_number);
  y2milestone("Create parameter list : %1", parameters);
  return parameters;

src/dialogs.ycp

@@ -282,7 +282,8 @@ any ParametersDialog () {
 //	  `item(`id(`full_logging), _("Activates all support functions"), Support::full_logging),
 //	  `item(`id(`minimal_logs), _("Only gather a minimum amount of info"), Support::minimal_logs),
 	  `item(`id(`include_slp), _("Include full SLP service lists"), Support::include_slp),
-	  `item(`id(`rpm_check), _("Performs an rpm -V for each installed rpm"), Support::rpm_check)
+	  `item(`id(`rpm_check), _("Performs an rpm -V for each installed rpm"), Support::rpm_check),
+	  `item(`id(`additional_logs), _("Include all log file lines, gather additional rotated logs"), Support::additional_logs)
 	];
     /* Support configure1 dialog contents */
     term contents = `VBox(
@@ -345,6 +346,7 @@ if (Support::use_defaults) UI::ChangeWidget(`rb, `CurrentButton, `use_defaults);
 	 Support::minimal_logs=contains(selected, `minimal_logs);
 	 Support::include_slp=contains(selected, `include_slp);
 	 Support::rpm_check=contains(selected, `rpm_check);
+	 Support::additional_logs=contains(selected, `additional_logs);
 
 	 switch((symbol)UI::QueryWidget(`rb, `CurrentButton)){
 	  case `use_defaults: