<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository upt-macports.

</pre>
<p><a href="https://github.com/macports/upt-macports/commit/f0641bb7c1632ecd64351e423a42c87e932437ac">https://github.com/macports/upt-macports/commit/f0641bb7c1632ecd64351e423a42c87e932437ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0641bb7c1632ecd64351e423a42c87e932437ac
</span>Author: Cyril Roelandt <tipecaml@gmail.com>
AuthorDate: Wed Oct 23 22:40:51 2019 +0200

<span style='display:block; white-space:pre;color:#404040;'>    Use a single _pkgname method for all package types.
</span>---
 upt_macports/upt_macports.py | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/upt_macports.py b/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;color:#808080;'>index bee3821..7abd3ce 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,16 +118,15 @@ class MacPortsPackage(object):
</span>             self.logger.error('Could not determine the type of the source archive') # noqa
             return 'unknown'
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> 
 class MacPortsPythonPackage(MacPortsPackage):
     template = 'python.Portfile'
     archive_format = upt.ArchiveType.SOURCE_TARGZ
     category = 'python'
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        macports_name = self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return f'{macports_name}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     @staticmethod
     def _normalized_macports_name(name):
         name = name.lower()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,10 +149,6 @@ class MacPortsPythonPackage(MacPortsPackage):
</span> class MacPortsNpmPackage(MacPortsPackage):
     template = 'npm.Portfile'
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        macports_name = self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return f'{macports_name}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     @staticmethod
     def _normalized_macports_name(name):
         name = name.lower()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,10 +160,6 @@ class MacPortsPerlPackage(MacPortsPackage):
</span>     archive_format = upt.ArchiveType.SOURCE_TARGZ
     category = 'perl'
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        macports_name = self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return macports_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     @staticmethod
     def _normalized_macports_name(name):
         return name.replace('::', '-')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,10 +202,6 @@ class MacPortsRubyPackage(MacPortsPackage):
</span>     archive_format = upt.ArchiveType.RUBYGEM
     category = 'ruby'
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        macports_name = self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return macports_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     @staticmethod
     def _normalized_macports_name(name):
         return name
</pre><pre style='margin:0'>

</pre>