[Emacs-diffs] master ee4eb28 01/01: Fix previous version of nsm-warnings-ok-p

[Lars Ingebrigtsen]

branch: master
commit ee4eb2810c4d9e5f4964d99e9ea9d3838f41f3d1
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Tue Nov 25 16:30:36 2014 +0100

    Fix previous version of nsm-warnings-ok-p
    
    * net/nsm.el (nsm-format-certificate): Don't bug out on missing
    elements.
    (nsm-warnings-ok-p): The new version of this function always
    returned nil when everything was OK.
---
 lisp/ChangeLog  |    2 ++
 lisp/net/nsm.el |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd21991..7fb1291 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * net/nsm.el (nsm-format-certificate): Don't bug out on missing
        elements.
+       (nsm-warnings-ok-p): The new version of this function always
+       returned nil when everything was OK.
 
 2014-11-25  Teodor Zlatanov  <address@hidden>
 
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index daf4bf5..c5e048a 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -342,9 +342,12 @@ unencrypted."
     result))
 
 (defun nsm-warnings-ok-p (status settings)
-  (null (cl-intersection
-         (plist-get settings :conditions)
-         (plist-get status :warnings))))
+  (let ((ok t)
+       (conditions (plist-get settings :conditions)))
+    (dolist (warning (plist-get status :warnings))
+      (unless (memq warning conditions)
+       (setq ok nil)))
+    ok))
 
 (defun nsm-remove-permanent-setting (id)
   (setq nsm-permanent-host-settings