Fix MSI and Solaris packages names

nmariz · nmariz · commit ed83f30addb9 · 2022-11-30T15:02:45.000Z
Change-Id: Ib370e46b14fe1e2f5784eaf36ebdf844c39a7ea6
diff --git a/cpydist/bdist_msi.py b/cpydist/bdist_msi.py
@@ -241,9 +241,9 @@ def _finalize_msi_descriptor(self):
     def _get_wixobj_name(self, myc_version=None):
         """Get the name for the wixobj-file."""
         if not myc_version:
-            myc_version = self.distribution.metadata.version
+            myc_version = self.distribution.get_version()
         label = f"-{self.label if self.label else ''}"
-        version_extra = f"-{VERSION_EXTRA if VERSION_EXTRA else ''}"
+        version_extra = f"-{VERSION_EXTRA}" if VERSION_EXTRA else ""
         arch = "windows-x86-64bit" if ARCH_64BIT else "windows-x86-32bit"
         return (
             f"mysql-connector-python{label}-{myc_version}{version_extra}"
diff --git a/cpydist/bdist_solaris.py b/cpydist/bdist_solaris.py
@@ -107,7 +107,7 @@ def initialize_options(self):
         BaseCommand.initialize_options(self)
         self.name = self.distribution.get_name()
         self.version = self.distribution.get_version()
-        self.version_extra = f"-{VERSION_EXTRA if VERSION_EXTRA else ''}"
+        self.version_extra = f"-{VERSION_EXTRA}" if VERSION_EXTRA else ""
         self.keep_temp = None
         self.create_dmg = False
         self.dist_dir = None
