[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[augeas-devel] augeas: master - Record an error if more than one lens tries to load a file



Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=a25e2a07ccd70d9299bc47f73df5eed365a1f1bd
Commit:        a25e2a07ccd70d9299bc47f73df5eed365a1f1bd
Parent:        a393b972501abb7fcb17d761eef1d71f19b5a0d5
Author:        David Lutterkort <lutter redhat com>
AuthorDate:    Thu Jan 7 11:28:51 2010 -0800
Committer:     David Lutterkort <lutter redhat com>
CommitterDate: Thu Jan 7 11:45:04 2010 -0800

Record an error if more than one lens tries to load a file

  * src/transform.c (file_info): new function; (transform_load): detect if
    more than one lens tries to load a file and record error in
    /augeas/files/PATH/error
---
 src/transform.c |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/transform.c b/src/transform.c
index a73218c..39c3bda 100644
--- a/src/transform.c
+++ b/src/transform.c
@@ -570,8 +570,22 @@ void transform_file_error(struct augeas *aug, const char *status,
     free(msg);
 }
 
+static struct tree *file_info(struct augeas *aug, const char *fname) {
+    char *path = NULL;
+    struct tree *result = NULL;
+    int r;
+
+    r = pathjoin(&path, 2, AUGEAS_META_FILES, fname);
+    ERR_NOMEM(r < 0, aug);
+
+    result = tree_find(aug, path);
+    ERR_BAIL(aug);
+ error:
+    return result;
+}
+
 int transform_load(struct augeas *aug, struct tree *xfm) {
-    int nmatches;
+    int nmatches = 0;
     char **matches;
     const char *lens_name;
     struct lens *lens = xfm_lens(aug, xfm, &lens_name);
@@ -585,8 +599,20 @@ int transform_load(struct augeas *aug, struct tree *xfm) {
     if (r == -1)
         return -1;
     for (int i=0; i < nmatches; i++) {
-        load_file(aug, lens, lens_name, matches[i]);
-        free(matches[i]);
+        const char *filename = matches[i] + strlen(aug->root) - 1;
+        struct tree *finfo = file_info(aug, filename);
+        if (finfo != NULL && tree_child(finfo, s_lens) != NULL) {
+            const char *s = xfm_lens_name(finfo);
+            char *fpath = file_name_path(aug, matches[i]);
+            transform_file_error(aug, "mxfm_load", filename,
+              "Lenses %s and %s could be used to load this file",
+                                 s, lens_name);
+            aug_rm(aug, fpath);
+            free(fpath);
+        } else {
+            load_file(aug, lens, lens_name, matches[i]);
+        }
+        FREE(matches[i]);
     }
     lens_release(lens);
     free(matches);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]