From debea9d8dd7315ef5f7d9fe91abbfc79fdb7cb1d Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 4 Mar 2015 02:02:04 -0500
Subject: [PATCH] Fix errors in the toolshed's hg middleware that would have
 (at worst) prevented repository tag validation from doing anything, allowing
 in invalid content, or (at best) blowing up completely when using hg from the
 command line instead of uploading directly

---
 lib/galaxy/webapps/tool_shed/framework/middleware/hg.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/webapps/tool_shed/framework/middleware/hg.py b/lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
index 14745cb6446..6e2bfad7d73 100644
--- a/lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
+++ b/lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
@@ -12,6 +12,7 @@ from paste.httpheaders import REMOTE_USER
 from galaxy.util import asbool
 from galaxy.util.hash_util import new_secure_hash
 from tool_shed.util import hg_util
+from tool_shed.util import commit_util
 import tool_shed.repository_types.util as rt_util
 
 from galaxy import eggs
@@ -291,7 +292,7 @@ class Hg( object ):
                 error_msg += 'the Tool Shed upload utility.  '
                 return False, error_msg
         return True, ''
-    
+
     def repository_tags_are_valid( self, filename, change_list ):
         """
         Make sure the any complex repository dependency definitions contain valid <repository> tags when pushing
@@ -299,9 +300,9 @@ class Hg( object ):
         """
         tag = '<repository'
         for change_dict in change_list:
-            lines = get_change_lines_in_file_for_tag( tag, change_dict )
+            lines = commit_util.get_change_lines_in_file_for_tag( tag, change_dict )
             for line in lines:
-                is_valid, error_msg = repository_tag_is_valid( filename, line )
+                is_valid, error_msg = self.repository_tag_is_valid( filename, line )
                 if not is_valid:
                     return False, error_msg
         return True, ''