gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-106-gd9e7c8f)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  d9e7c8f29bdef0913515649356f4b1d43a36fee6 (commit)
       via  84949b85df8e8ac1475ae8555bcffe060624d254 (commit)
      from  83777ec203d9dfcf6a257a0c92e2fe2a3deeb552 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gschem/src/x_rc.c     |    6 ++++--
 libgeda/src/f_basic.c |    7 ++++++-
 libgeda/src/g_rc.c    |    6 ++++--
 3 files changed, 14 insertions(+), 5 deletions(-)


=================
 Commit Messages
=================

commit d9e7c8f29bdef0913515649356f4b1d43a36fee6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Silently skip missing/duplicate rc during schematic load.
    
    Affects-bug: lp-710587

:100644 100644 723b19c... a843b33... M	libgeda/src/f_basic.c

commit 84949b85df8e8ac1475ae8555bcffe060624d254
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Silently skip duplicate config files.
    
    Affects-bug: lp-710587

:100644 100644 a1aa7e3... 1a123b8... M	gschem/src/x_rc.c
:100644 100644 a3ca9ed... 206290a... M	libgeda/src/g_rc.c

=========
 Changes
=========

commit d9e7c8f29bdef0913515649356f4b1d43a36fee6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Silently skip missing/duplicate rc during schematic load.
    
    Affects-bug: lp-710587

diff --git a/libgeda/src/f_basic.c b/libgeda/src/f_basic.c
index 723b19c..a843b33 100644
--- a/libgeda/src/f_basic.c
+++ b/libgeda/src/f_basic.c
@@ -244,7 +244,12 @@ int f_open_flags(TOPLEVEL *toplevel, PAGE *page,
     full_rcfilename = g_build_filename (file_directory, "gafrc", NULL);
     g_rc_parse_file (toplevel, full_rcfilename, &tmp_err);
     if (tmp_err != NULL) {
-      s_log_message ("%s\n", tmp_err->message);
+      /* Config files are allowed to be missing or skipped; check for
+       * this. */
+      if (!g_error_matches (tmp_err, G_FILE_ERROR, G_FILE_ERROR_NOENT) &&
+          !g_error_matches (tmp_err, EDA_ERROR, EDA_ERROR_RC_TWICE)) {
+        s_log_message ("%s\n", tmp_err->message);
+      }
       g_error_free (tmp_err);
       tmp_err = NULL;
     }

commit 84949b85df8e8ac1475ae8555bcffe060624d254
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Silently skip duplicate config files.
    
    Affects-bug: lp-710587

diff --git a/gschem/src/x_rc.c b/gschem/src/x_rc.c
index a1aa7e3..1a123b8 100644
--- a/gschem/src/x_rc.c
+++ b/gschem/src/x_rc.c
@@ -46,8 +46,10 @@ x_rc_parse_gschem_error (GError **err, GSCHEM_TOPLEVEL *w_current)
                   "\n\nThe gschem log may contain more information."));
   } else {
 
-    /* Config files are allowed to be missing; check for this. */
-    if (g_error_matches (*err, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+    /* Config files are allowed to be missing or skipped; check for
+     * this. */
+    if (g_error_matches (*err, G_FILE_ERROR, G_FILE_ERROR_NOENT) ||
+        g_error_matches (*err, EDA_ERROR, EDA_ERROR_RC_TWICE)) {
       return;
     }
 
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index a3ca9ed..206290a 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -292,8 +292,10 @@ g_rc_parse__process_error (GError **err, const gchar *pname)
     fprintf(stderr, "%s\n", msgl);
 
   } else {
-    /* Config files are allowed to be missing; check for this. */
-    if (g_error_matches (*err, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+    /* Config files are allowed to be missing or skipped; check for
+     * this. */
+    if (g_error_matches (*err, G_FILE_ERROR, G_FILE_ERROR_NOENT) ||
+        g_error_matches (*err, EDA_ERROR, EDA_ERROR_RC_TWICE)) {
       return;
     }
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs