Tweak commands patch

fml/commands.patch

@@ -9,7 +9,7 @@
  
  class Commands(object):
      """Contains the commands and initialisation for a full mcp run"""
-@@ -918,6 +920,8 @@
+@@ -943,6 +945,8 @@
          binlk = {CLIENT: self.binclient, SERVER: self.binserver}
          testlk = {CLIENT: self.testclient, SERVER: self.testserver}
  
@@ -18,7 +18,7 @@
          if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
              return False
          return True
-@@ -1249,6 +1253,9 @@
+@@ -1274,6 +1278,9 @@
          pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@@ -28,7 +28,7 @@
  
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
-@@ -1306,7 +1313,7 @@
+@@ -1331,7 +1338,7 @@
              raise
  
      def startserver(self):
@@ -37,7 +37,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1314,7 +1321,7 @@
+@@ -1339,7 +1346,7 @@
          self.runmc(forkcmd)
  
      def startclient(self):
@@ -46,7 +46,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          natives = os.path.join('..', self.dirnatives)
-@@ -1671,7 +1678,7 @@
+@@ -1696,7 +1703,7 @@
          self.runcmd(forkcmd)
          return True
  
@@ -55,7 +55,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1686,6 +1693,9 @@
+@@ -1711,6 +1718,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -65,7 +65,7 @@
                  for class_file in fnmatch.filter(filelist, '*.class'):
                      class_name = class_path + os.path.splitext(class_file)[0]
                      bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1858,6 +1868,9 @@
+@@ -1883,6 +1893,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -75,7 +75,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1878,6 +1891,9 @@
+@@ -1903,6 +1916,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}