From 976ca293a6ab33c60b0d6326ae1a69b9ba8349c0 Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Fri, 23 Sep 2011 14:07:50 +0200
Subject: [PATCH] Status file fixes, now that we deal with a package symbol.

There's a difference between 'package and :package even if both are symbolp.
---
 el-get-core.el   | 6 ++++++
 el-get-custom.el | 7 -------
 el-get-status.el | 6 ++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/el-get-core.el b/el-get-core.el
index 9684db40d..fda05f7c2 100644
--- a/el-get-core.el
+++ b/el-get-core.el
@@ -77,6 +77,12 @@ returning a list that contains it (and only it)."
   (if (listp element-or-list) element-or-list
       (list element-or-list)))
 
+(defun el-get-source-name (source)
+  "Return the package name (stringp) given an `el-get-sources'
+entry."
+  (if (symbolp source) (symbol-name source)
+    (format "%s" (plist-get source :name))))
+
 
 ;;
 ;; Common support bits
diff --git a/el-get-custom.el b/el-get-custom.el
index 365d16772..3bb21ac32 100644
--- a/el-get-custom.el
+++ b/el-get-custom.el
@@ -44,13 +44,6 @@
 )
 ;;; END "Fuzzy" data structure support
 
-(defun el-get-source-name (source)
-  "Return the package name (stringp) given an `el-get-sources'
-entry."
-  (if (symbolp source) (symbol-name source)
-    (format "%s" (plist-get source :name))))
-
-
 (defconst el-get-build-recipe-body
   '(choice :tag "Format"
 
diff --git a/el-get-status.el b/el-get-status.el
index 966e4cfdd..e91146f5b 100644
--- a/el-get-status.el
+++ b/el-get-status.el
@@ -23,7 +23,9 @@
 
 (defun el-get-package-symbol (package-name)
   "Returns a symbol :package."
-  (if (symbolp package-name) package-name
+  (if (and (symbolp package-name)
+	   (string= (substring (symbol-name package-name) 0 1) ":"))
+      package-name
     (intern (format ":%s" package-name))))
 
 (defun el-get-package-name (package-symbol)
@@ -56,7 +58,7 @@
 (defun el-get-list-package-names-with-status (&rest status)
   "Return package names that are currently in given status"
   (loop for (p s) on (el-get-read-all-packages-status) by 'cddr
-	if (member s status) collect (el-get-package-name p)))
+	when (member s status) collect (el-get-package-name p)))
 
 (defun el-get-read-package-with-status (action &rest status)
   "Read a package name in given status"