Merge branches 'nchaimov-fix-forced-makefiles' and 'fix-build-markdow…

…n' of github.com:ParaToolsInc/taucmdr into unstable
ParaToolsInc · Sep 10, 2021 · 28a994d · 28a994d
3 parents 39526fa + 31d4703 + 2db5e2c
commit 28a994d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/taucmdr/cf/software/tau_installation.py b/packages/taucmdr/cf/software/tau_installation.py
@@ -447,7 +447,7 @@ def __init__(self, sources, target_arch, target_os, compilers,
         for met in self.metrics:
             mets.extend(met.split(','))
         self.metrics = mets
-        uses = lambda pkg: sources[pkg] if forced_makefile else getattr(self, 'uses_'+pkg)
+        uses = lambda pkg: sources.get(pkg, False) if forced_makefile else getattr(self, 'uses_'+pkg)
         for pkg in 'binutils', 'libunwind', 'libelf', 'libdwarf', 'papi', 'pdt', 'ompt', 'libotf2', 'sqlite3':
             if uses(pkg):
                 self.add_dependency(pkg, sources)

diff --git a/setup.py b/setup.py
@@ -550,7 +550,7 @@ def run(self):
                          cmd_obj.usage]
                 filename = os.path.join(self.dest, cmd_name.replace('.', '_')+'.md')
                 with open(filename, 'w') as fout:
-                    fout.write(unidecode('\n'.join(parts).decode('utf-8')))
+                    fout.write(unidecode('\n'.join(parts)))
                 print('wrote %s' % filename)
                 indentspace = ''