From f690aa17a880b34a5a1252e67ef1bebecc19eb2a Mon Sep 17 00:00:00 2001 From: Joseph Eng Date: Sun, 14 Jul 2024 20:08:52 -0700 Subject: [PATCH] Pass patch_list to constructor --- upstream_utils/update_mpack.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/upstream_utils/update_mpack.py b/upstream_utils/update_mpack.py index 8d5066fb038..ed686fa7183 100755 --- a/upstream_utils/update_mpack.py +++ b/upstream_utils/update_mpack.py @@ -60,12 +60,7 @@ def open_repo(self, *, err_msg_if_absent): os.chdir(dest) def apply_patches(self): - for f in [ - "0001-Don-t-emit-inline-defs.patch", - "0002-Update-amalgamation-script.patch", - "0003-Use-namespace-for-C.patch", - "0004-Group-doxygen-into-MPack-module.patch", - ]: + for f in self.patch_list: git_am( os.path.join( self.wpilib_root, f"upstream_utils/{self.name}_patches", f @@ -89,7 +84,7 @@ def main(): "0004-Group-doxygen-into-MPack-module.patch", ] - mpack = Lib(name, url, tag, [], lambda: None) + mpack = Lib(name, url, tag, patch_list, lambda: None) mpack.clone() wpilib_root = mpack.wpilib_root