Attachment 96481 Details for Bug 76706 – 0001-main-don-t-write-an-empty-file-when-no_boot_log-is-s.patch

0001-main-don-t-write-an-empty-file-when-no_boot_log-is-s.patch

0001-main-don-t-write-an-empty-file-when-no_boot_log-is-s.patch (text/plain), 1.48 KB, created by Cosimo Cecchi on 2014-03-27 19:59:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cosimo Cecchi

Created: 2014-03-27 19:59:12 UTC

Size: 1.48 KB

patch

obsolete

>From 6a917664d0e2a178cb4c6117c467d4e6505192f9 Mon Sep 17 00:00:00 2001
>From: Cosimo Cecchi <cosimoc@gnome.org>
>Date: Thu, 27 Mar 2014 12:53:21 -0700
>Subject: [PATCH 1/2] main: don't write an empty file when no_boot_log is set
>
>https://bugs.freedesktop.org/show_bug.cgi?id=76706
>---
> src/main.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/src/main.c b/src/main.c
>index 6b0be54..a2cc714 100644
>--- a/src/main.c
>+++ b/src/main.c
>@@ -689,14 +689,17 @@ get_cache_file_for_mode (ply_mode_t mode)
> }
> 
> static const char *
>-get_log_file_for_mode (ply_mode_t mode)
>+get_log_file_for_state (state_t *state)
> {
>   const char *filename;
> 
>-  switch ((int)mode)
>+  switch ((int)state->mode)
>     {
>     case PLY_MODE_BOOT:
>-      filename = PLYMOUTH_LOG_DIRECTORY "/boot.log";
>+      if (state->no_boot_log)
>+	filename = NULL;
>+      else
>+	filename = PLYMOUTH_LOG_DIRECTORY "/boot.log";
>       break;
>     case PLY_MODE_SHUTDOWN:
>     case PLY_MODE_UPDATES:
>@@ -744,7 +747,7 @@ spool_error (state_t *state)
> 
>   ply_trace ("spooling error for viewer");
> 
>-  logfile = get_log_file_for_mode (state->mode);
>+  logfile = get_log_file_for_state (state);
>   logspool = get_log_spool_file_for_mode (state->mode);
> 
>   if (logfile != NULL && logspool != NULL)
>@@ -772,7 +775,7 @@ prepare_logging (state_t *state)
>       return;
>     }
> 
>-  logfile = get_log_file_for_mode (state->mode);
>+  logfile = get_log_file_for_state (state);
>   if (logfile != NULL)
>     {
>       bool log_opened;
>-- 
>1.8.1.2
>

Actions: View

Attachments on bug 76706: 96481 | 96482

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.