[asterisk-commits] pabelanger: branch pabelanger/non-root r675 - in /asterisk/team/pabelanger/no...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Sat Jul 31 22:50:51 2010
New Revision: 675

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=675
Log:
Simplify sub-directory check

Added:
    asterisk/team/pabelanger/non-root/tests/sip_attended_transfer/configs/branch-1.4/
      - copied from r674, asterisk/team/pabelanger/non-root/tests/sip_attended_transfer/configs/1.4/
Removed:
    asterisk/team/pabelanger/non-root/tests/sip_attended_transfer/configs/1.4/
Modified:
    asterisk/team/pabelanger/non-root/lib/python/asterisk/asterisk.py

Modified: asterisk/team/pabelanger/non-root/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/lib/python/asterisk/asterisk.py?view=diff&rev=675&r1=674&r2=675
==============================================================================
--- asterisk/team/pabelanger/non-root/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/non-root/lib/python/asterisk/asterisk.py Sat Jul 31 22:50:51 2010
@@ -182,15 +182,7 @@
             print "Config file '%s' does not exist" % cfg_path
             return
 
-	v = "trunk"
-	if self.ast_version.branch == "branch-1.8":
-		v = "1.8"
-	elif self.ast_version.branch == "branch-1.6.2":
-		v = "1.6.2"
-	elif self.ast_version.branch == "branch-1.4":
-		v = "1.4"
-        
-	tmp = "%s/%s/%s" % (os.path.dirname(cfg_path), v, os.path.basename(cfg_path))
+	tmp = "%s/%s/%s" % (os.path.dirname(cfg_path), self.ast_version.branch, os.path.basename(cfg_path))
 	if os.path.exists(tmp):
             cfg_path = tmp
         target_path = os.path.join(self.astetcdir, os.path.basename(cfg_path))