diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-08-05 06:42:31 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-08-05 06:42:31 +0800 |
| commit | dbe28857f7841fcf454095a0ddb01de72dce4004 (patch) | |
| tree | bc46ee984dabe2337610dd27cfaad8ac7ce89253 /deskutils | |
| parent | da5fb81d20fff09cbbad2ac4046dc3030c97c01b (diff) | |
| download | marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.tar marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.tar.gz marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.tar.bz2 marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.tar.lz marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.tar.xz marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.tar.zst marcuscom-ports-dbe28857f7841fcf454095a0ddb01de72dce4004.zip | |
Fix gnome-system-log's out-of-the-box behavior by ignoring /dev/console
as a valid logfile.
Reported by: mezz
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2618 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/gnome-utils/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/gnome-utils/files/patch-logview_logview.c | 18 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/files/patch-logview_logview.c | 18 |
4 files changed, 28 insertions, 10 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index dbfc1a206..6dffad717 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeutils2 PORTVERSION= 2.7.90 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c index 1155fdb97..942ed8a02 100644 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Sun Feb 16 15:36:07 2003 -+++ logview/logview.c Thu Apr 24 12:53:35 2003 -@@ -774,7 +774,7 @@ +--- logview/logview.c.orig Fri May 7 21:47:59 2004 ++++ logview/logview.c Wed Aug 4 18:40:24 2004 +@@ -781,7 +781,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -797,7 +797,7 @@ +@@ -804,7 +804,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -831,7 +831,7 @@ +@@ -838,7 +838,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -27,3 +27,11 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); +@@ -922,6 +922,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + fprintf(stderr, "Found a logfile: (%s)\n", logfile); + return logfile; + } diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index dbfc1a206..6dffad717 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeutils2 PORTVERSION= 2.7.90 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 1155fdb97..942ed8a02 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Sun Feb 16 15:36:07 2003 -+++ logview/logview.c Thu Apr 24 12:53:35 2003 -@@ -774,7 +774,7 @@ +--- logview/logview.c.orig Fri May 7 21:47:59 2004 ++++ logview/logview.c Wed Aug 4 18:40:24 2004 +@@ -781,7 +781,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -797,7 +797,7 @@ +@@ -804,7 +804,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -831,7 +831,7 @@ +@@ -838,7 +838,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -27,3 +27,11 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); +@@ -922,6 +922,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + fprintf(stderr, "Found a logfile: (%s)\n", logfile); + return logfile; + } |