diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2016-06-17 11:34:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-20 15:04:40 +0200 |
| commit | 9459dd85520efa92ba1af94ea8a2a50ce457c6bf (patch) | |
| tree | bb1894b878d560c8989ac925dc826a01e647c3eb /doc | |
| parent | 9099868cc2ba9a698156a9e8395fe0e07fc64ff1 (diff) | |
| download | ptxdist-9459dd85520efa92ba1af94ea8a2a50ce457c6bf.tar.gz ptxdist-9459dd85520efa92ba1af94ea8a2a50ce457c6bf.tar.xz | |
Fix build-time Python error
Building the documentation inside PTXdist (e.g. outside of a BSP project)
else fails with:
TypeError: Can't convert 'NoneType' object to str implicitly
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/conf.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/conf.py b/doc/conf.py index 7ef33f81a..fe3530549 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -106,16 +106,16 @@ try: except: toolchain = "/opt/OSELAS.Toolchain-2014.12.2/arm-v5te-linux-gnueabi/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/bin".split("/") -ptxdistPlatformDir = "``platform-" + (os.getenv("PTXCONF_PLATFORM") or "versatilepb") + "``" +ptxdistPlatformDir = "``platform-" + os.getenv("PTXCONF_PLATFORM", "versatilepb") + "``" oselasTCNarch = gnu_target.split("-")[0] oselasTCNvariant = gnu_target.split("-")[1] oselasTCNVendorVersion = toolchain[-4].split("-")[1] oselasTCNVendorptxdistversion = re.sub(r"\..$",".0", toolchain[-4].split("-")[1]) oselasToolchainName = toolchain[-3] + "_" + re.sub(r"-([a-z])",r"_\1", toolchain[-2], 3) -ptxdistBSPName = "OSELAS.BSP-" + os.getenv("PTXCONF_PROJECT_VENDOR") + "-" + os.getenv("PTXCONF_PROJECT", "") + os.getenv("PTXCONF_PROJECT_VERSION", "") +ptxdistBSPName = "OSELAS.BSP-" + os.getenv("PTXCONF_PROJECT_VENDOR", "Pengutronix") + "-" + os.getenv("PTXCONF_PROJECT", "Example") + os.getenv("PTXCONF_PROJECT_VERSION", "") ptxdistCompilerName = gnu_target ptxdistCompilerVersion = toolchain[-2] -ptxdistPlatformName = "platform-" + os.getenv("PTXCONF_PLATFORM") or "versatilepb" +ptxdistPlatformName = "platform-" + os.getenv("PTXCONF_PLATFORM", "versatilepb") ptxdistPlatformCollection = "\ " ptxdistVendorVersion = os.getenv("PTXDIST_VERSION_YEAR") + "." + os.getenv("PTXDIST_VERSION_MONTH") + "." + os.getenv("PTXDIST_VERSION_BUGFIX") package = "<package>" |