Merge "Closes-Bug: #1610074 renamed rpm package could have been used …

…to add image to SM. Extract package name from package itself instead of package filename."

src/server_mgr_main.py

@@ -1553,7 +1553,10 @@ def put_image(self):
                                 version = ver + "-"+ release.split('.')[0]
                         elif output and 'RPM' in output:
                             sm = ServerMgrUtil()
-                            version = sm.get_package_version(os.path.basename(image_path))
+                            # package could have been renamed, extract package name using rpm
+                            cmd = "rpm -qp %s" %image_path.strip()
+                            pkg_name = subprocess.check_output(cmd, shell = True)
+                            version = sm.get_package_version(pkg_name)
                         else:
                             version = subprocess.check_output(['dpkg-deb', '-f',image_path,'Version'])
                         version = version.strip('\n')