Fix accidental commands.patch overwrite
This commit is contained in:
parent
3c14424e30
commit
1176144590
|
@ -4,12 +4,21 @@
|
||||||
|
|
||||||
|
|
||||||
def reallyrmtree(path):
|
def reallyrmtree(path):
|
||||||
+ if os.path.isfile(os.path.join(path, 'asm-all-4.0.jar')): #Check if asm exists, indicating the libs folder, if so, don't delete it
|
+ if os.path.isfile(os.path.join(path, 'asm-4.1.tar.gz')): #Check if asm exists, indicating the libs folder, if so, don't delete it
|
||||||
+ return
|
+ return
|
||||||
if not sys.platform.startswith('win'):
|
if not sys.platform.startswith('win'):
|
||||||
if os.path.exists(path):
|
if os.path.exists(path):
|
||||||
shutil.rmtree(path)
|
shutil.rmtree(path)
|
||||||
@@ -788,6 +790,8 @@
|
@@ -139,6 +141,8 @@
|
||||||
|
fieldnames = csvreader.fieldnames
|
||||||
|
return set(fieldnames)
|
||||||
|
|
||||||
|
+def commands_sanity_check():
|
||||||
|
+ print 'Commands patch applied successfully'
|
||||||
|
|
||||||
|
class Commands(object):
|
||||||
|
"""Contains the commands and initialisation for a full mcp run"""
|
||||||
|
@@ -796,6 +800,8 @@
|
||||||
binlk = {CLIENT: self.binclient, SERVER: self.binserver}
|
binlk = {CLIENT: self.binclient, SERVER: self.binserver}
|
||||||
testlk = {CLIENT: self.testclient, SERVER: self.testserver}
|
testlk = {CLIENT: self.testclient, SERVER: self.testserver}
|
||||||
|
|
||||||
|
@ -18,7 +27,7 @@
|
||||||
if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
|
if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
@@ -1029,6 +1033,10 @@
|
@@ -1037,6 +1043,10 @@
|
||||||
pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
|
pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
|
||||||
pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
|
pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
|
||||||
|
|
||||||
|
@ -29,7 +38,7 @@
|
||||||
if not os.path.exists(pathbinlk[side]):
|
if not os.path.exists(pathbinlk[side]):
|
||||||
os.makedirs(pathbinlk[side])
|
os.makedirs(pathbinlk[side])
|
||||||
|
|
||||||
@@ -1062,7 +1070,7 @@
|
@@ -1070,7 +1080,7 @@
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def startserver(self):
|
def startserver(self):
|
||||||
|
@ -38,7 +47,7 @@
|
||||||
classpath = [os.path.join('..', p) for p in classpath]
|
classpath = [os.path.join('..', p) for p in classpath]
|
||||||
classpath = os.pathsep.join(classpath)
|
classpath = os.pathsep.join(classpath)
|
||||||
os.chdir(self.dirjars)
|
os.chdir(self.dirjars)
|
||||||
@@ -1070,7 +1078,7 @@
|
@@ -1078,7 +1088,7 @@
|
||||||
self.runmc(forkcmd)
|
self.runmc(forkcmd)
|
||||||
|
|
||||||
def startclient(self):
|
def startclient(self):
|
||||||
|
@ -47,7 +56,7 @@
|
||||||
classpath = [os.path.join('..', p) for p in classpath]
|
classpath = [os.path.join('..', p) for p in classpath]
|
||||||
classpath = os.pathsep.join(classpath)
|
classpath = os.pathsep.join(classpath)
|
||||||
natives = os.path.join('..', self.dirnatives)
|
natives = os.path.join('..', self.dirnatives)
|
||||||
@@ -1197,20 +1205,20 @@
|
@@ -1205,20 +1215,20 @@
|
||||||
with open(self.csvmethods, 'rb') as fh:
|
with open(self.csvmethods, 'rb') as fh:
|
||||||
methodsreader = csv.DictReader(fh)
|
methodsreader = csv.DictReader(fh)
|
||||||
for row in methodsreader:
|
for row in methodsreader:
|
||||||
|
@ -71,7 +80,7 @@
|
||||||
names['params'][row['param']] = row['name']
|
names['params'][row['param']] = row['name']
|
||||||
|
|
||||||
regexps = {
|
regexps = {
|
||||||
@@ -1344,13 +1352,13 @@
|
@@ -1352,13 +1362,13 @@
|
||||||
methods = {}
|
methods = {}
|
||||||
for row in methodsreader:
|
for row in methodsreader:
|
||||||
#HINT: Only include methods that have a non-empty description
|
#HINT: Only include methods that have a non-empty description
|
||||||
|
@ -87,7 +96,7 @@
|
||||||
fields[row['searge']] = row['desc'].replace('*/', '* /')
|
fields[row['searge']] = row['desc'].replace('*/', '* /')
|
||||||
|
|
||||||
regexps = {
|
regexps = {
|
||||||
@@ -1427,7 +1435,7 @@
|
@@ -1435,7 +1445,7 @@
|
||||||
self.runcmd(forkcmd)
|
self.runcmd(forkcmd)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -96,7 +105,7 @@
|
||||||
if not reobf:
|
if not reobf:
|
||||||
md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
|
md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
|
||||||
else:
|
else:
|
||||||
@@ -1442,6 +1450,9 @@
|
@@ -1450,6 +1460,9 @@
|
||||||
class_path = ''
|
class_path = ''
|
||||||
else:
|
else:
|
||||||
class_path += '/'
|
class_path += '/'
|
||||||
|
@ -106,7 +115,7 @@
|
||||||
for class_file in fnmatch.filter(filelist, '*.class'):
|
for class_file in fnmatch.filter(filelist, '*.class'):
|
||||||
class_name = class_path + os.path.splitext(class_file)[0]
|
class_name = class_path + os.path.splitext(class_file)[0]
|
||||||
bin_file = os.path.normpath(os.path.join(path, class_file))
|
bin_file = os.path.normpath(os.path.join(path, class_file))
|
||||||
@@ -1535,6 +1546,8 @@
|
@@ -1546,6 +1559,8 @@
|
||||||
if not os.path.exists(outpathlk[side]):
|
if not os.path.exists(outpathlk[side]):
|
||||||
os.makedirs(outpathlk[side])
|
os.makedirs(outpathlk[side])
|
||||||
|
|
||||||
|
@ -115,7 +124,7 @@
|
||||||
# HINT: We extract the modified class files
|
# HINT: We extract the modified class files
|
||||||
with closing(zipfile.ZipFile(jarlk[side])) as zipjar:
|
with closing(zipfile.ZipFile(jarlk[side])) as zipjar:
|
||||||
for in_class in trgclasses:
|
for in_class in trgclasses:
|
||||||
@@ -1548,6 +1561,23 @@
|
@@ -1559,6 +1574,23 @@
|
||||||
out_class = out_class.replace(self.nullpkg, '')
|
out_class = out_class.replace(self.nullpkg, '')
|
||||||
if out_class[0] == '/':
|
if out_class[0] == '/':
|
||||||
out_class = out_class[1:]
|
out_class = out_class[1:]
|
||||||
|
@ -139,7 +148,7 @@
|
||||||
try:
|
try:
|
||||||
zipjar.extract(out_class, outpathlk[side])
|
zipjar.extract(out_class, outpathlk[side])
|
||||||
self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class)
|
self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class)
|
||||||
@@ -1594,6 +1624,9 @@
|
@@ -1605,6 +1637,9 @@
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
for entry in newfiles:
|
for entry in newfiles:
|
||||||
|
@ -149,7 +158,7 @@
|
||||||
if entry[3] == 'U':
|
if entry[3] == 'U':
|
||||||
self.logger.info('Retrieving file from server : %s', entry[0])
|
self.logger.info('Retrieving file from server : %s', entry[0])
|
||||||
cur_file = os.path.normpath(entry[0])
|
cur_file = os.path.normpath(entry[0])
|
||||||
@@ -1614,6 +1647,9 @@
|
@@ -1625,6 +1660,9 @@
|
||||||
md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
|
md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
|
||||||
outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
|
outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
|
||||||
src = {CLIENT: self.srcclient, SERVER: self.srcserver}
|
src = {CLIENT: self.srcclient, SERVER: self.srcserver}
|
||||||
|
@ -159,10 +168,3 @@
|
||||||
|
|
||||||
# HINT: We need a table for the old md5 and the new ones
|
# HINT: We need a table for the old md5 and the new ones
|
||||||
md5table = {}
|
md5table = {}
|
||||||
@@ -1656,3 +1692,6 @@
|
|
||||||
except IOError:
|
|
||||||
self.logger.error('* File %s copy failed', in_class)
|
|
||||||
|
|
||||||
+def commands_sanity_check():
|
|
||||||
+ print 'Commands patch applied successfully'
|
|
||||||
+
|
|
||||||
|
|
Loading…
Reference in New Issue