Bug 599748 - Remove custom |def check_call()|, now that Python 2.4 is unsupported; (Av1) Remove 'util.py'.

r=ted.mielczarek.
This commit is contained in:
Serge Gautherie 2011-04-14 15:44:13 +02:00
parent dcca90ed82
commit f293775842
3 changed files with 2 additions and 53 deletions

View File

@ -57,8 +57,7 @@
import sys, os
from optparse import OptionParser
from subprocess import Popen, PIPE
from util import check_call
from subprocess import PIPE, Popen, check_call
def RequireEnvironmentVariable(v):
"""Return the value of the environment variable named v, or print

View File

@ -1,50 +0,0 @@
#!/usr/bin/python
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# The Mozilla Foundation
# Portions created by the Initial Developer are Copyright (C) 2008
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Ted Mielczarek <ted.mielczarek@gmail.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
try:
from subprocess import check_call
except ImportError:
import subprocess
def check_call(*popenargs, **kwargs):
retcode = subprocess.call(*popenargs, **kwargs)
if retcode:
cmd = kwargs.get("args")
if cmd is None:
cmd = popenargs[0]
raise Exception("Command '%s' returned non-zero exit status %i" % (cmd, retcode))

View File

@ -15,7 +15,7 @@ import sys
import datetime
import shutil
from optparse import OptionParser
from build.util import check_call
from subprocess import check_call
topsrcdir = os.path.dirname(__file__)
if topsrcdir == '':