Changeset c101fe1 for waflib/Build.py

Timestamp:

Nov 13, 2013, 1:00:56 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:

d3066e2

Parents:

54e74f0

Message:

waf, waflib: update to 1.7.13

File:

• waflib/Build.py (modified) (4 diffs)

waflib/Build.py

@@ -133 +133 @@
                         for t in env['tools']:
                                 self.setup(**t)
-                f=None
-                try:
-                        dbfn=os.path.join(self.variant_dir,Context.DBFILE)
+                dbfn=os.path.join(self.variant_dir,Context.DBFILE)
+                try:
+                        data=Utils.readf(dbfn,'rb')
+                except(IOError,EOFError):
+                        Logs.debug('build: Could not load the build cache %s (missing)'%dbfn)
+                else:
                         try:
-                                f=open(dbfn,'rb')
-                        except(IOError,EOFError):
-                                Logs.debug('build: Could not load the build cache %s (missing)'%dbfn)
-                        else:
+                                waflib.Node.pickle_lock.acquire()
+                                waflib.Node.Nod3=self.node_class
                                 try:
-                                        waflib.Node.pickle_lock.acquire()
-                                        waflib.Node.Nod3=self.node_class
-                                        try:
-                                                data=cPickle.load(f)
-                                        except Exception ,e:
-                                                Logs.debug('build: Could not pickle the build cache %s: %r'%(dbfn,e))
-                                        else:
-                                                for x in SAVED_ATTRS:
-                                                        setattr(self,x,data[x])
-                                finally:
-                                        waflib.Node.pickle_lock.release()
-                finally:
-                        if f:
-                                f.close()
+                                        data=cPickle.loads(data)
+                                except Exception ,e:
+                                        Logs.debug('build: Could not pickle the build cache %s: %r'%(dbfn,e))
+                                else:
+                                        for x in SAVED_ATTRS:
+                                                setattr(self,x,data[x])
+                        finally:
+                                waflib.Node.pickle_lock.release()
                 self.init_dirs()
         def store(self):
@@ -165 +160 @@
                         waflib.Node.pickle_lock.acquire()
                         waflib.Node.Nod3=self.node_class
-                        f=None
-                        try:
-                                f=open(db+'.tmp','wb')
-                                cPickle.dump(data,f,-1)
-                        finally:
-                                if f:
-                                        f.close()
+                        x=cPickle.dumps(data,-1)
                 finally:
                         waflib.Node.pickle_lock.release()
+                Utils.writef(db+'.tmp',x,m='wb')
                 try:
                         st=os.stat(db)
-                        os.unlink(db)
+                        os.remove(db)
                         if not Utils.is_win32:
                                 os.chown(db+'.tmp',st.st_uid,st.st_gid)
@@ -482 +472 @@
                         if self.relative_trick:
                                 destfile=os.path.join(destpath,y.path_from(self.path))
-                                Utils.check_dir(os.path.dirname(destfile))
                         else:
                                 destfile=os.path.join(destpath,y.name)
@@ -625 +614 @@
                 try:
                         if not self.progress_bar:
-                                Logs.info('- unlink %s'%tgt)
+                                Logs.info('- remove %s'%tgt)
                         os.remove(tgt)
                 except OSError: