From a333991516b92d62727c2edc711f8adb515203ce Mon Sep 17 00:00:00 2001
From: rzaitov <r-zaitov@yandex.ru>
Date: Thu, 14 Nov 2013 20:16:36 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=BD=D0=B0=20Manifest=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=82=D1=87=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnitTests/XmlParcher/test_manifestPatcher.py | 16 ++++++++++++++++
 scripts/TouchinBuild/utils/ManifestPatcher.py    |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py

diff --git a/scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py b/scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py
new file mode 100644
index 0000000..de75c4f
--- /dev/null
+++ b/scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py
@@ -0,0 +1,16 @@
+import unittest
+from utils.ManifestPatcher import ManifestPatcher
+
+
+class TestManifestPatcher(unittest.TestCase):
+	def setUp(self):
+		self.patcher = ManifestPatcher('somePath')
+
+	def test_parseRawName(self):
+		nameInfo1 = self.patcher.parseRawName('simpleName')
+		self.assertEqual(None, nameInfo1['prefix'])
+		self.assertEqual('simpleName', nameInfo1['original_name'])
+
+		nameInfo2 = self.patcher.parseRawName('prefix:originalName')
+		self.assertEqual('prefix', nameInfo2['prefix'])
+		self.assertEqual('originalName', nameInfo2['original_name'])
diff --git a/scripts/TouchinBuild/utils/ManifestPatcher.py b/scripts/TouchinBuild/utils/ManifestPatcher.py
index 4520f40..650eccd 100644
--- a/scripts/TouchinBuild/utils/ManifestPatcher.py
+++ b/scripts/TouchinBuild/utils/ManifestPatcher.py
@@ -35,11 +35,11 @@ class ManifestPatcher(XmlPatcher):
 		"""
 
 		result = rawName.split(':')
-		prefixExists = len(result) > 0
+		prefixExists = len(result) > 1
 
 		atrInfo = {
 			'prefix': result[0] if prefixExists else None,
-			'original_name': result[1]
+			'original_name': result[1] if prefixExists else result[0]
 		}
 
 		return atrInfo