From 958ba38cdb62ce86517e662a1991655daac04dc3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Jul 2014 22:03:19 +0200 Subject: [PATCH 1/3] Fix: "invalid literal for float()" error when parsing `fdisk` output Reason was the wrong locale setting. We need to set LC_ALL=C, too. --- source/projects/fedora-arm-installer/fedora-arm-installer | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/projects/fedora-arm-installer/fedora-arm-installer b/source/projects/fedora-arm-installer/fedora-arm-installer index 764b1c0..c1b7a91 100755 --- a/source/projects/fedora-arm-installer/fedora-arm-installer +++ b/source/projects/fedora-arm-installer/fedora-arm-installer @@ -67,7 +67,9 @@ class linux: def execcomd(self, comdlist, pipelist=[], errredir=False): sys.stderr.write("execute:" + str(comdlist) + "|" + str(pipelist) + "\n"); sys.stderr.flush() - envrobjc = os.environ; envrobjc["LANG"] = "C" + envrobjc = os.environ; + envrobjc["LANG"] = "C" + envrobjc["LC_ALL"] = "C" if (not errredir): returnpi = subprocess.Popen(comdlist, stdout=subprocess.PIPE, env=envrobjc) else: From dfdecfe7276f6ac20c6721337c2352b7cd34ebbc Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Jul 2014 22:05:33 +0200 Subject: [PATCH 2/3] Change date in infotext into ISO-format (yyyy-mm-dd). ISO-format saves showing the used format beside the data since only the ISO-format looks like this. --- source/projects/fedora-arm-installer/fedora-arm-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/projects/fedora-arm-installer/fedora-arm-installer b/source/projects/fedora-arm-installer/fedora-arm-installer index c1b7a91..24a9eb4 100755 --- a/source/projects/fedora-arm-installer/fedora-arm-installer +++ b/source/projects/fedora-arm-installer/fedora-arm-installer @@ -14,7 +14,7 @@ versnumb = "8" infotext = ''' -Date: 08/06/2013 (dd/mm/yyyy) +Date: 2013-06-08 Version: 1.1.1-''' + versnumb + ''' Author: Jon Chiappetta (jonc_mailbox@yahoo.ca) ''' From 1a52bc3da390c6cbaf1af495a91e2c9df4a5a3d5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Jul 2014 22:12:14 +0200 Subject: [PATCH 3/3] Use sys.executable for `callself` instead of hard-coded path. This is for Linux only. I did not dare touching the Windows part, as it does too much stuff I not understand why it is done. --- source/projects/fedora-arm-installer/fedora-arm-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/projects/fedora-arm-installer/fedora-arm-installer b/source/projects/fedora-arm-installer/fedora-arm-installer index 24a9eb4..d7ee913 100755 --- a/source/projects/fedora-arm-installer/fedora-arm-installer +++ b/source/projects/fedora-arm-installer/fedora-arm-installer @@ -84,7 +84,7 @@ class linux: return "" def callself(self, progcomd, argslist): - proglist = ["/usr/bin/python"] + proglist = [sys.executable] if (progcomd[0:1] != "/"): progcomd = (os.getcwd() + "/" + progcomd)