Changeset 904702d for waflib/Tools/kde4.py

Timestamp:

Mar 14, 2015, 6:06:10 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6d7acc8

Parents:

5525507

Message:

waf, waflib: update to 1.8.7

File:

• waflib/Tools/kde4.py (modified) (2 diffs)

waflib/Tools/kde4.py

@@ -20 +20 @@
 def configure(self):
         kdeconfig=self.find_program('kde4-config')
-        prefix=self.cmd_and_log('%s --prefix'%kdeconfig).strip()
+        prefix=self.cmd_and_log(kdeconfig+['--prefix']).strip()
         fname='%s/share/apps/cmake/modules/KDELibsDependencies.cmake'%prefix
         try:os.stat(fname)
@@ -29 +29 @@
         try:
                 txt=Utils.readf(fname)
-        except(OSError,IOError):
+        except EnvironmentError:
                 self.fatal('could not read %s'%fname)
         txt=txt.replace('\\\n','\n')