Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 904329 - Fix rebuild_check.py when files are removed. r=gps
  • Loading branch information
glandium committed Aug 15, 2013
1 parent c826268 commit 2d009f5
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 10 deletions.
24 changes: 19 additions & 5 deletions config/rebuild_check.py
Expand Up @@ -3,25 +3,39 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import errno

def mtime(path):
return os.stat(path).st_mtime
try:
return os.stat(path).st_mtime
except OSError as e:
if e.errno == errno.ENOENT:
return -1
raise

def rebuild_check(args):
target = args[0]
deps = args[1:]
if not os.path.exists(target):
t = mtime(target)
if t < 0:
print target
return
t = mtime(target)

newer = []
removed = []
for dep in deps:
if mtime(dep) > t:
deptime = mtime(dep)
if deptime < 0:
removed.append(dep)
elif mtime(dep) > t:
newer.append(dep)

if newer:
if newer and removed:
print 'Rebuilding %s because %s changed and %s was removed' % (target, ', '.join(newer), ', '.join(removed))
elif newer:
print 'Rebuilding %s because %s changed' % (target, ', '.join(newer))
elif removed:
print 'Rebuilding %s because %s was removed' % (target, ', '.join(removed))
else:
print 'Rebuilding %s for an unknown reason' % target

Expand Down
24 changes: 19 additions & 5 deletions js/src/config/rebuild_check.py
Expand Up @@ -3,25 +3,39 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import errno

def mtime(path):
return os.stat(path).st_mtime
try:
return os.stat(path).st_mtime
except OSError as e:
if e.errno == errno.ENOENT:
return -1
raise

def rebuild_check(args):
target = args[0]
deps = args[1:]
if not os.path.exists(target):
t = mtime(target)
if t < 0:
print target
return
t = mtime(target)

newer = []
removed = []
for dep in deps:
if mtime(dep) > t:
deptime = mtime(dep)
if deptime < 0:
removed.append(dep)
elif mtime(dep) > t:
newer.append(dep)

if newer:
if newer and removed:
print 'Rebuilding %s because %s changed and %s was removed' % (target, ', '.join(newer), ', '.join(removed))
elif newer:
print 'Rebuilding %s because %s changed' % (target, ', '.join(newer))
elif removed:
print 'Rebuilding %s because %s was removed' % (target, ', '.join(removed))
else:
print 'Rebuilding %s for an unknown reason' % target

Expand Down

0 comments on commit 2d009f5

Please sign in to comment.