From 0504b5a7c3496f3d5c511ac41570d6d6e54b7ac4 Mon Sep 17 00:00:00 2001 From: zeldakatze Date: Thu, 11 Apr 2024 00:34:00 +0200 Subject: [PATCH 1/2] don't add the secondaryArchSuffix on patchset export --- HaikuPorter/Port.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/HaikuPorter/Port.py b/HaikuPorter/Port.py index 9af05005..9b08f0e9 100644 --- a/HaikuPorter/Port.py +++ b/HaikuPorter/Port.py @@ -711,14 +711,14 @@ def extractPatchset(self): ## use enumerate to avoid your own couters for s, source in enumerate(self.sources, 1): if s == 1: - patchSetFileName = self.name + '-' + self.version + '.patchset' - archPatchSetFileName = (self.name + '-' + self.version + '-' + patchSetFileName = self.baseName + '-' + self.version + '.patchset' + archPatchSetFileName = (self.baseName + '-' + self.version + '-' + self.targetArchitecture + '.patchset') else: - patchSetFileName = (self.name + '-' + self.version + '-source' + patchSetFileName = (self.baseName + '-' + self.version + '-source' + str(s) + '.patchset') - archPatchSetFileName = (self.name + '-' + self.version + '-' + archPatchSetFileName = (self.baseName + '-' + self.version + '-' + self.targetArchitecture + '-source' + str(s) + '.patchset') patchSetFilePath = self.patchesDir + '/' + patchSetFileName From 4769c1915bd2a399ad432ee2153df612838d8e16 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 29 Aug 2024 12:45:10 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: OscarL --- HaikuPorter/Port.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HaikuPorter/Port.py b/HaikuPorter/Port.py index 9b08f0e9..ced7fd59 100644 --- a/HaikuPorter/Port.py +++ b/HaikuPorter/Port.py @@ -712,13 +712,13 @@ def extractPatchset(self): for s, source in enumerate(self.sources, 1): if s == 1: patchSetFileName = self.baseName + '-' + self.version + '.patchset' - archPatchSetFileName = (self.baseName + '-' + self.version + '-' + archPatchSetFileName = (self.name + '-' + self.version + '-' + self.targetArchitecture + '.patchset') else: patchSetFileName = (self.baseName + '-' + self.version + '-source' + str(s) + '.patchset') - archPatchSetFileName = (self.baseName + '-' + self.version + '-' + archPatchSetFileName = (self.name + '-' + self.version + '-' + self.targetArchitecture + '-source' + str(s) + '.patchset') patchSetFilePath = self.patchesDir + '/' + patchSetFileName