From c7686e209a3273c26254232fb43d279a3a353da6 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 26 Jan 2011 18:04:45 -0800 Subject: mp.py: fix handling of --pkg --- build_tools/bin/mp.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py index caab80f..e43b68d 100755 --- a/build_tools/bin/mp.py +++ b/build_tools/bin/mp.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2 -# Version 0.5.1 +# Version 0.6.0 import os import sys @@ -130,20 +130,21 @@ def commandline(): if cmd2 is True: cli_list.append('--'+o) - # Convert key=value to a single string - k = cli_dict.keys() - v = cli_dict.values() - final_dict = ' '.join ([ "%s %s" % (k, v) for k, v in cli_dict.items()]) - print "final_dict=",final_dict - # Create makepkg command makepkg_cmd.extend(cli_list) - makepkg_cmd.extend(final_dict) - + for k in cli_dict.keys(): + v = cli_dict.get(k) + makepkg_cmd.append(k) + makepkg_cmd.append(v) + + # Add "--ignorearch" if "--pkg" is called to avoid package not + # available in arch=('') errors + if "--pkg" in makepkg_cmd: + makepkg_cmd.append("--ignorearch") # Remove bump option from makepkg command if it exists if "--bump" in makepkg_cmd: makepkg_cmd.remove("--bump") - # Remove --geninteg option (if it exists) from makepkg command. + # Remove "--geninteg" option (if it exists) from makepkg command. # Checking for *sums is done automaticly by mp.py if "--geninteg" in makepkg_cmd: makepkg_cmd.remove("--geninteg") -- cgit v0.12