From 4b747079645f3fa0809a36667ebc07bab4b44215 Mon Sep 17 00:00:00 2001
From: "Ryan C. Thompson" <rct@thompsonclan.org>
Date: Sat, 6 Oct 2012 18:13:32 -0700
Subject: [PATCH] Update emacsmirror method for github method cleanup

Now it add a :pkgname property instead of just adding ":username
emacsmirror".

Also update the tests for the Github method
---
 methods/el-get-emacsmirror.el |  3 ++-
 test/el-get-issue-513.el      | 36 +++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/methods/el-get-emacsmirror.el b/methods/el-get-emacsmirror.el
index 604a0d05..827cf83e 100644
--- a/methods/el-get-emacsmirror.el
+++ b/methods/el-get-emacsmirror.el
@@ -20,7 +20,8 @@
   "Return a github-type source equivalent to emacsmirror PACKAGE."
   (assert (equal (el-get-package-type package) 'emacsmirror) nil
           "Need an emacsmirror package")
-  (append '(:type github :username "emacsmirror")
+  (append `(:type github
+                  :pkgname ,(format "emacsmirror/%s" package))
           (el-get-package-def package)))
 
 ;;
diff --git a/test/el-get-issue-513.el b/test/el-get-issue-513.el
index b20eae97..1dfbd317 100644
--- a/test/el-get-issue-513.el
+++ b/test/el-get-issue-513.el
@@ -5,18 +5,38 @@
 (setq debug-on-error t
       el-get-verbose t)
 
-;; Install a github-type recipe
-(el-get 'sync 'window-layout)
-;; Install an emacsmirror-type recipe
-(el-get 'sync 'dired-plus)
+(condition-case nil
+    (error "THROW")
+  (error (message "Caught an error")))
+
+;; ;; Install a github-type recipe
+;; (el-get 'sync 'window-layout)
+;; ;; Install an emacsmirror-type recipe
+;; (el-get 'sync 'dired-plus)
+
+;; Try to install a recipe for a nonexistent github repo
+(condition-case err
+    (progn
+      ;; Should fail
+      (let ((el-get-sources
+             '((:name valid-recipe-for-nonexistent-repo
+                      :pkgname "xjklfjdlfs/fdjsklfdsj"
+                      :type github)))
+            ;; This seems to escape error handlers when
+            ;; `debug-on-error' is t.
+            (debug-on-error nil))
+        (el-get 'sync 'valid-recipe-for-nonexistent-repo))
+      (signal 'test-failure
+              '("The package \"valid-recipe-for-nonexistent-repo\" should have caused an error, but it didn't.")))
+  (error (message "Installing \"valid-recipe-for-nonexistent-repo\" failed as expected. The error message was: %S" err)))
 
 (condition-case err
     (progn
       ;; Should fail
       (let ((el-get-sources
-             '((:name broken-pkg
+             '((:name broken-github-recipe
                       :type github))))
-        (el-get 'sync 'broken-pkg))
+        (el-get 'sync 'broken-github-recipe))
       (signal 'test-failure
-              '("The package\"broken-pkg\" should have caused an error, but it didn't.")))
-  (error (message "Installing \"broken-pkg\" failed as expected. The error message was: %S" err)))
+              '("The package \"broken-github-recipe\" should have caused an error, but it didn't.")))
+  (error (message "Installing \"broken-github-recipe\" failed as expected. The error message was: %S" err)))