Fixed messed up indentation in commands1.py #4695

ext/toolchain/commands1.py

@@ -319,7 +319,6 @@ class InternalCommands:
 			self.configure(target)
 
 	def checkGTest(self):
-    
 		dir = self.extDir + '/' + self.gtestDir
 		if (os.path.isdir(dir)):
 			return
@@ -335,7 +334,6 @@ class InternalCommands:
 		self.zipExtractAll(zip, dir)
 
 	def checkGMock(self):
-    
 		dir = self.extDir + '/' + self.gmockDir
 		if (os.path.isdir(dir)):
 			return
@@ -1100,6 +1098,7 @@ class InternalCommands:
 			err = os.system(cmd)
 			if err != 0:
 				raise Exception('rpmlint failed: ' + str(err))
+
 		finally:
 			self.restore_chdir()
 
@@ -1368,9 +1367,19 @@ class InternalCommands:
 			nsPluginTarget = self.getLibraryDistFilename(type, pluginsDir, 'ns')
 			self.ftpUpload(ftp, nsPluginSource, nsPluginTarget)
 
-                # os_bits should be loaded with '32bit' or '64bit'
+	def getLibraryDistFilename(self, type, dir, name):
-                import platform
+		(platform, packageExt, libraryExt) = self.getDistributePlatformInfo(type)
-                (os_bits, other) = platform.architecture()
+		branch = self.getGitBranchName()
+		revision = self.getGitRevision()
+		firstPart = '%s-%s-%s-%s' % (name, branch, revision, platform)
+
+		filename = '%s.%s' % (firstPart, libraryExt)
+		if type == 'rpm' or type == 'deb':
+			# linux is a bit special, include dist type (deb/rpm in filename)
+			filename = '%s-%s.%s' % (firstPart, packageExt, libraryExt)
+
+		return filename
+
 	def findLibraryFile(self, type, dir, name):
 		(platform, packageExt, libraryExt) = self.getDistributePlatformInfo(type)
 		ext = libraryExt