Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Oct 21st, 2010  |  syntax: None  |  size: 25.67 KB  |  hits: 44  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -Naur xen-4.0.1.orig/Config.mk xen-4.0.1/Config.mk
  2. --- xen-4.0.1.orig/Config.mk    2010-10-21 11:40:41.420937333 -0700
  3. +++ xen-4.0.1/Config.mk 2010-10-21 11:40:41.377603979 -0700
  4. @@ -39,7 +39,7 @@
  5.  BISON  ?= bison
  6.  FLEX   ?= flex
  7.  
  8. -PYTHON      ?= python
  9. +PYTHON      ?= python2
  10.  PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
  11.  # The above requires that PREFIX contains *no spaces*. This variable is here
  12.  # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
  13. diff -Naur xen-4.0.1.orig/docs/pythfilter.py xen-4.0.1/docs/pythfilter.py
  14. --- xen-4.0.1.orig/docs/pythfilter.py   2010-10-21 11:34:49.973172332 -0700
  15. +++ xen-4.0.1/docs/pythfilter.py        2010-10-21 11:37:20.458436345 -0700
  16. @@ -1,4 +1,4 @@
  17. -#!/usr/bin/env python
  18. +#!/usr/bin/env python2
  19.  
  20.  # pythfilter.py v1.5.5, written by Matthias Baas (baas@ira.uka.de)
  21.  
  22. diff -Naur xen-4.0.1.orig/list.txt xen-4.0.1/list.txt
  23. --- xen-4.0.1.orig/list.txt     1969-12-31 16:00:00.000000000 -0800
  24. +++ xen-4.0.1/list.txt  2010-10-21 11:36:53.119036000 -0700
  25. @@ -0,0 +1,60 @@
  26. +./xen/tools/get-fields.sh
  27. +./xen/tools/compat-build-header.py
  28. +./xen/tools/compat-build-source.py
  29. +./docs/pythfilter.py
  30. +./tools/xenmon/xenmon.py
  31. +./tools/pygrub/src/pygrub
  32. +./tools/misc/xensymoops
  33. +./tools/misc/xm
  34. +./tools/misc/sbdf2devicepath
  35. +./tools/misc/xen-bugtool
  36. +./tools/misc/xen-python-path
  37. +./tools/misc/sxp-pretty
  38. +./tools/misc/xend
  39. +./tools/misc/xsview
  40. +./tools/misc/xencons
  41. +./tools/check/check_logging
  42. +./tools/remus/remus
  43. +./tools/security/xensec_ezpolicy
  44. +./tools/security/python/xensec_tools/acm_getlabel
  45. +./tools/vnet/scripts/vn
  46. +./tools/xentrace/xentrace_format
  47. +./tools/python/xen/remus/vm.py
  48. +./tools/python/xen/remus/save.py
  49. +./tools/python/xen/xend/arch.py
  50. +./tools/python/xen/xend/XendSXPDev.py
  51. +./tools/python/xen/xend/sxp.py
  52. +./tools/python/xen/xend/XendClient.py
  53. +./tools/python/xen/xend/osdep.py.orig
  54. +./tools/python/xen/xend/osdep.py
  55. +./tools/python/xen/util/vscsi_util.py
  56. +./tools/python/xen/util/bugtool.py
  57. +./tools/python/xen/util/pci.py
  58. +./tools/python/test.py
  59. +./tools/python/logging/logging-0.4.9.2/test/log_test2.py
  60. +./tools/python/logging/logging-0.4.9.2/test/log_test12.py
  61. +./tools/python/logging/logging-0.4.9.2/test/log_test20.py
  62. +./tools/python/logging/logging-0.4.9.2/test/log_test4.py
  63. +./tools/python/logging/logging-0.4.9.2/test/log_test10.py
  64. +./tools/python/logging/logging-0.4.9.2/test/log_test1.py
  65. +./tools/python/logging/logging-0.4.9.2/test/log_test.py
  66. +./tools/python/logging/logging-0.4.9.2/test/log_test8.py
  67. +./tools/python/logging/logging-0.4.9.2/test/log_test3.py
  68. +./tools/python/logging/logging-0.4.9.2/test/log_test15.py
  69. +./tools/python/logging/logging-0.4.9.2/test/log_test7.py
  70. +./tools/python/logging/logging-0.4.9.2/test/log_test18.py
  71. +./tools/python/logging/logging-0.4.9.2/test/logrecv.py
  72. +./tools/python/logging/logging-0.4.9.2/test/log_test6.py
  73. +./tools/python/logging/logging-0.4.9.2/test/log_test21.py
  74. +./tools/python/logging/logging-0.4.9.2/test/log_test17.py
  75. +./tools/python/logging/logging-0.4.9.2/test/log_test19.py
  76. +./tools/python/logging/logging-0.4.9.2/test/log_test13.py
  77. +./tools/python/logging/logging-0.4.9.2/test/log_test0.py
  78. +./tools/python/logging/logging-0.4.9.2/test/log_test14.py
  79. +./tools/python/logging/logging-0.4.9.2/test/log_test5.py
  80. +./tools/python/logging/logging-0.4.9.2/test/logconf.py
  81. +./tools/python/logging/logging-0.4.9.2/test/log_test16.py
  82. +./tools/python/logging/logging-0.4.9.2/test/log_test22.py
  83. +./tools/python/logging/logging-0.4.9.2/test/log_test9.py
  84. +./tools/python/logging/logging-0.4.9.2/test/log_test11.py
  85. +./tools/python/install-wrap
  86. diff -Naur xen-4.0.1.orig/tools/check/check_logging xen-4.0.1/tools/check/check_logging
  87. --- xen-4.0.1.orig/tools/check/check_logging    2010-10-21 11:34:50.046520332 -0700
  88. +++ xen-4.0.1/tools/check/check_logging 2010-10-21 11:37:46.481038182 -0700
  89. @@ -1,4 +1,4 @@
  90. -#!/usr/bin/env python
  91. +#!/usr/bin/env python2
  92.  #  -*- mode: python; -*-
  93.  
  94.  import os
  95. diff -Naur xen-4.0.1.orig/tools/misc/sbdf2devicepath xen-4.0.1/tools/misc/sbdf2devicepath
  96. --- xen-4.0.1.orig/tools/misc/sbdf2devicepath   2010-10-21 11:34:50.043186332 -0700
  97. +++ xen-4.0.1/tools/misc/sbdf2devicepath        2010-10-21 11:37:31.742897788 -0700
  98. @@ -1,4 +1,4 @@
  99. -#!/usr/bin/env python
  100. +#!/usr/bin/env python2
  101.  #  -*- mode: python; -*-
  102.  #============================================================================
  103.  # This library is free software; you can redistribute it and/or
  104. diff -Naur xen-4.0.1.orig/tools/misc/sxp-pretty xen-4.0.1/tools/misc/sxp-pretty
  105. --- xen-4.0.1.orig/tools/misc/sxp-pretty        2010-10-21 11:34:50.043186332 -0700
  106. +++ xen-4.0.1/tools/misc/sxp-pretty     2010-10-21 11:37:37.906848449 -0700
  107. @@ -1,4 +1,4 @@
  108. -#!/usr/bin/env python
  109. +#!/usr/bin/env python2
  110.  #  -*- mode: python; -*-
  111.  #============================================================================
  112.  # This library is free software; you can redistribute it and/or
  113. diff -Naur xen-4.0.1.orig/tools/misc/xen-bugtool xen-4.0.1/tools/misc/xen-bugtool
  114. --- xen-4.0.1.orig/tools/misc/xen-bugtool       2010-10-21 11:34:50.043186332 -0700
  115. +++ xen-4.0.1/tools/misc/xen-bugtool    2010-10-21 11:37:33.766433741 -0700
  116. @@ -1,4 +1,4 @@
  117. -#!/usr/bin/env python
  118. +#!/usr/bin/env python2
  119.  
  120.  #  -*- mode: python; -*-
  121.  
  122. diff -Naur xen-4.0.1.orig/tools/misc/xencons xen-4.0.1/tools/misc/xencons
  123. --- xen-4.0.1.orig/tools/misc/xencons   2010-10-21 11:34:50.043186332 -0700
  124. +++ xen-4.0.1/tools/misc/xencons        2010-10-21 11:37:43.857441834 -0700
  125. @@ -1,4 +1,4 @@
  126. -#!/usr/bin/env python
  127. +#!/usr/bin/env python2
  128.  
  129.  ##############################################
  130.  # Console client for Xen guest OSes
  131. diff -Naur xen-4.0.1.orig/tools/misc/xend xen-4.0.1/tools/misc/xend
  132. --- xen-4.0.1.orig/tools/misc/xend      2010-10-21 11:34:50.043186332 -0700
  133. +++ xen-4.0.1/tools/misc/xend   2010-10-21 11:37:39.970387341 -0700
  134. @@ -1,4 +1,4 @@
  135. -#!/usr/bin/env python
  136. +#!/usr/bin/env python2
  137.  #  -*- mode: python; -*-
  138.  #============================================================================
  139.  # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
  140. diff -Naur xen-4.0.1.orig/tools/misc/xen-python-path xen-4.0.1/tools/misc/xen-python-path
  141. --- xen-4.0.1.orig/tools/misc/xen-python-path   2010-10-21 11:34:50.043186332 -0700
  142. +++ xen-4.0.1/tools/misc/xen-python-path        2010-10-21 11:37:35.746630755 -0700
  143. @@ -1,4 +1,4 @@
  144. -#!/usr/bin/env python
  145. +#!/usr/bin/env python2
  146.  #  -*- mode: python; -*-
  147.  #============================================================================
  148.  # This library is free software; you can redistribute it and/or
  149. diff -Naur xen-4.0.1.orig/tools/misc/xensymoops xen-4.0.1/tools/misc/xensymoops
  150. --- xen-4.0.1.orig/tools/misc/xensymoops        2010-10-21 11:34:50.043186332 -0700
  151. +++ xen-4.0.1/tools/misc/xensymoops     2010-10-21 11:37:27.779167773 -0700
  152. @@ -1,4 +1,4 @@
  153. -#!/usr/bin/env python
  154. +#!/usr/bin/env python2
  155.  
  156.  # An oops analyser for Xen
  157.  # Usage: xensymoops path-to-xen.s < oops-message
  158. diff -Naur xen-4.0.1.orig/tools/misc/xm xen-4.0.1/tools/misc/xm
  159. --- xen-4.0.1.orig/tools/misc/xm        2010-10-21 11:34:50.043186332 -0700
  160. +++ xen-4.0.1/tools/misc/xm     2010-10-21 11:37:29.826039179 -0700
  161. @@ -1,4 +1,4 @@
  162. -#!/usr/bin/env python
  163. +#!/usr/bin/env python2
  164.  #  -*- mode: python; -*-
  165.  import sys
  166.  
  167. diff -Naur xen-4.0.1.orig/tools/misc/xsview xen-4.0.1/tools/misc/xsview
  168. --- xen-4.0.1.orig/tools/misc/xsview    2010-10-21 11:34:50.043186332 -0700
  169. +++ xen-4.0.1/tools/misc/xsview 2010-10-21 11:37:42.123935767 -0700
  170. @@ -1,4 +1,4 @@
  171. -#!/usr/bin/env python
  172. +#!/usr/bin/env python2
  173.  
  174.  import sys
  175.  
  176. diff -Naur xen-4.0.1.orig/tools/pygrub/src/pygrub xen-4.0.1/tools/pygrub/src/pygrub
  177. --- xen-4.0.1.orig/tools/pygrub/src/pygrub      2010-10-21 11:34:50.039852332 -0700
  178. +++ xen-4.0.1/tools/pygrub/src/pygrub   2010-10-21 11:37:25.155572664 -0700
  179. @@ -1,4 +1,4 @@
  180. -#! /usr/bin/env python
  181. +#! /usr/bin/env python2
  182.  #
  183.  # pygrub - simple python-based bootloader for Xen
  184.  #
  185. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/logconf.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/logconf.py
  186. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/logconf.py 2010-10-21 11:34:50.293236332 -0700
  187. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/logconf.py      2010-10-21 11:39:19.541010237 -0700
  188. @@ -1,4 +1,4 @@
  189. -#!/usr/bin/env python
  190. +#!/usr/bin/env python2
  191.  #
  192.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  193.  #
  194. @@ -1735,4 +1735,4 @@
  195.      root.mainloop()
  196.  
  197.  if __name__ == "__main__":
  198. -    main()
  199. \ No newline at end of file
  200. +    main()
  201. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/logrecv.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/logrecv.py
  202. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/logrecv.py 2010-10-21 11:34:50.293236332 -0700
  203. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/logrecv.py      2010-10-21 11:38:57.492139314 -0700
  204. @@ -1,4 +1,4 @@
  205. -#! /usr/bin/env python
  206. +#! /usr/bin/env python2
  207.  #
  208.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  209.  #
  210. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test0.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test0.py
  211. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test0.py       2010-10-21 11:34:50.293236332 -0700
  212. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test0.py    2010-10-21 11:39:11.966920077 -0700
  213. @@ -1,4 +1,4 @@
  214. -#!/usr/bin/env python
  215. +#!/usr/bin/env python2
  216.  #
  217.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  218.  #
  219. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test10.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test10.py
  220. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test10.py      2010-10-21 11:34:50.293236332 -0700
  221. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test10.py   2010-10-21 11:38:36.531604657 -0700
  222. @@ -1,4 +1,4 @@
  223. -#!/usr/bin/env python
  224. +#!/usr/bin/env python2
  225.  #
  226.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  227.  #
  228. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test11.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test11.py
  229. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test11.py      2010-10-21 11:34:50.296570332 -0700
  230. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test11.py   2010-10-21 11:39:31.425533198 -0700
  231. @@ -1,4 +1,4 @@
  232. -#!/usr/bin/env python
  233. +#!/usr/bin/env python2
  234.  #
  235.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  236.  #
  237. @@ -69,4 +69,4 @@
  238.      logging.shutdown()
  239.  
  240.  if __name__ == "__main__":
  241. -    test()
  242. \ No newline at end of file
  243. +    test()
  244. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test12.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test12.py
  245. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test12.py      2010-10-21 11:34:50.293236332 -0700
  246. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test12.py   2010-10-21 11:38:30.388271385 -0700
  247. @@ -1,4 +1,4 @@
  248. -#!/usr/bin/env python
  249. +#!/usr/bin/env python2
  250.  #
  251.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  252.  #
  253. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test13.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test13.py
  254. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test13.py      2010-10-21 11:34:50.293236332 -0700
  255. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test13.py   2010-10-21 11:39:10.280084881 -0700
  256. @@ -1,4 +1,4 @@
  257. -#!/usr/bin/env python
  258. +#!/usr/bin/env python2
  259.  #
  260.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  261.  #
  262. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test14.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test14.py
  263. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test14.py      2010-10-21 11:34:50.293236332 -0700
  264. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test14.py   2010-10-21 11:39:13.803770340 -0700
  265. @@ -1,4 +1,4 @@
  266. -#!/usr/bin/env python
  267. +#!/usr/bin/env python2
  268.  #
  269.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  270.  #
  271. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test15.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test15.py
  272. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test15.py      2010-10-21 11:34:50.293236332 -0700
  273. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test15.py   2010-10-21 11:38:51.058271369 -0700
  274. @@ -1,4 +1,4 @@
  275. -#!/usr/bin/env python
  276. +#!/usr/bin/env python2
  277.  #
  278.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  279.  #
  280. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test16.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test16.py
  281. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test16.py      2010-10-21 11:34:50.293236332 -0700
  282. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test16.py   2010-10-21 11:39:21.124501557 -0700
  283. @@ -1,4 +1,4 @@
  284. -#!/usr/bin/env python
  285. +#!/usr/bin/env python2
  286.  #
  287.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  288.  #
  289. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test17.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test17.py
  290. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test17.py      2010-10-21 11:34:50.293236332 -0700
  291. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test17.py   2010-10-21 11:39:06.206343887 -0700
  292. @@ -1,4 +1,4 @@
  293. -#!/usr/bin/env python
  294. +#!/usr/bin/env python2
  295.  #
  296.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  297.  #
  298. @@ -108,4 +108,4 @@
  299.              fname = sys.argv[1]
  300.          else:
  301.              fname = "warn.ini"
  302. -        runclient(fname)
  303. \ No newline at end of file
  304. +        runclient(fname)
  305. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test18.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test18.py
  306. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test18.py      2010-10-21 11:34:50.293236332 -0700
  307. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test18.py   2010-10-21 11:38:55.451935442 -0700
  308. @@ -1,4 +1,4 @@
  309. -#!/usr/bin/env python
  310. +#!/usr/bin/env python2
  311.  #
  312.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  313.  #
  314. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test19.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test19.py
  315. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test19.py      2010-10-21 11:34:50.293236332 -0700
  316. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test19.py   2010-10-21 11:39:08.503240336 -0700
  317. @@ -1,4 +1,4 @@
  318. -#!/usr/bin/env python
  319. +#!/usr/bin/env python2
  320.  #
  321.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  322.  #
  323. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test1.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test1.py
  324. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test1.py       2010-10-21 11:34:50.293236332 -0700
  325. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test1.py    2010-10-21 11:38:41.581604555 -0700
  326. @@ -1,4 +1,4 @@
  327. -#!/usr/bin/env python
  328. +#!/usr/bin/env python2
  329.  #
  330.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  331.  #
  332. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test20.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test20.py
  333. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test20.py      2010-10-21 11:34:50.293236332 -0700
  334. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test20.py   2010-10-21 11:38:32.221604618 -0700
  335. @@ -1,4 +1,4 @@
  336. -#!/usr/bin/env python
  337. +#!/usr/bin/env python2
  338.  #
  339.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  340.  #
  341. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test21.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test21.py
  342. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test21.py      2010-10-21 11:34:50.293236332 -0700
  343. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test21.py   2010-10-21 11:39:01.852575531 -0700
  344. @@ -1,4 +1,4 @@
  345. -#!/usr/bin/env python
  346. +#!/usr/bin/env python2
  347.  #
  348.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  349.  #
  350. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test22.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test22.py
  351. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test22.py      2010-10-21 11:34:50.293236332 -0700
  352. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test22.py   2010-10-21 11:39:24.998223001 -0700
  353. @@ -1,4 +1,4 @@
  354. -#!/usr/bin/env python
  355. +#!/usr/bin/env python2
  356.  #
  357.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  358.  #
  359. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test2.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test2.py
  360. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test2.py       2010-10-21 11:34:50.293236332 -0700
  361. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test2.py    2010-10-21 11:38:28.754938250 -0700
  362. @@ -1,4 +1,4 @@
  363. -#!/usr/bin/env python
  364. +#!/usr/bin/env python2
  365.  #
  366.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  367.  #
  368. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test3.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test3.py
  369. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test3.py       2010-10-21 11:34:50.293236332 -0700
  370. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test3.py    2010-10-21 11:38:48.911604245 -0700
  371. @@ -1,4 +1,4 @@
  372. -#!/usr/bin/env python
  373. +#!/usr/bin/env python2
  374.  #
  375.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  376.  #
  377. @@ -67,4 +67,4 @@
  378.      logging.shutdown()
  379.  
  380.  if __name__ == "__main__":
  381. -    main()
  382. \ No newline at end of file
  383. +    main()
  384. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test4.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test4.py
  385. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test4.py       2010-10-21 11:34:50.293236332 -0700
  386. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test4.py    2010-10-21 11:38:34.184937908 -0700
  387. @@ -1,4 +1,4 @@
  388. -#!/usr/bin/env python
  389. +#!/usr/bin/env python2
  390.  #
  391.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  392.  #
  393. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test5.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test5.py
  394. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test5.py       2010-10-21 11:34:50.293236332 -0700
  395. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test5.py    2010-10-21 11:39:16.664056905 -0700
  396. @@ -1,4 +1,4 @@
  397. -#!/usr/bin/env python
  398. +#!/usr/bin/env python2
  399.  #
  400.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  401.  #
  402. @@ -41,4 +41,4 @@
  403.      log.removeHandler(hdlr)
  404.  
  405.  if __name__ == "__main__":
  406. -    main()
  407. \ No newline at end of file
  408. +    main()
  409. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test6.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test6.py
  410. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test6.py       2010-10-21 11:34:50.293236332 -0700
  411. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test6.py    2010-10-21 11:38:59.982388365 -0700
  412. @@ -1,4 +1,4 @@
  413. -#!/usr/bin/env python
  414. +#!/usr/bin/env python2
  415.  #
  416.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  417.  #
  418. @@ -44,4 +44,4 @@
  419.      logger.removeHandler(ntl)
  420.  
  421.  if __name__ == "__main__":
  422. -    main()
  423. \ No newline at end of file
  424. +    main()
  425. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test7.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test7.py
  426. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test7.py       2010-10-21 11:34:50.293236332 -0700
  427. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test7.py    2010-10-21 11:38:53.241714350 -0700
  428. @@ -1,4 +1,4 @@
  429. -#!/usr/bin/env python
  430. +#!/usr/bin/env python2
  431.  #
  432.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  433.  #
  434. @@ -45,4 +45,4 @@
  435.      logger.info("Info index = %d", i)
  436.  sh.close()
  437.  mh.close()
  438. -logger.removeHandler(mh)
  439. \ No newline at end of file
  440. +logger.removeHandler(mh)
  441. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test8.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test8.py
  442. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test8.py       2010-10-21 11:34:50.293236332 -0700
  443. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test8.py    2010-10-21 11:38:47.144936804 -0700
  444. @@ -1,4 +1,4 @@
  445. -#!/usr/bin/env python
  446. +#!/usr/bin/env python2
  447.  #
  448.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  449.  #
  450. @@ -66,4 +66,4 @@
  451.      logger.removeHandler(hdlr)
  452.  
  453.  if __name__ == "__main__":
  454. -    main()
  455. \ No newline at end of file
  456. +    main()
  457. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test9.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test9.py
  458. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test9.py       2010-10-21 11:34:50.296570332 -0700
  459. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test9.py    2010-10-21 11:39:29.882044287 -0700
  460. @@ -1,4 +1,4 @@
  461. -#!/usr/bin/env python
  462. +#!/usr/bin/env python2
  463.  #
  464.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  465.  #
  466. diff -Naur xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test.py xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test.py
  467. --- xen-4.0.1.orig/tools/python/logging/logging-0.4.9.2/test/log_test.py        2010-10-21 11:34:50.293236332 -0700
  468. +++ xen-4.0.1/tools/python/logging/logging-0.4.9.2/test/log_test.py     2010-10-21 11:38:43.844938356 -0700
  469. @@ -1,4 +1,4 @@
  470. -#!/usr/bin/env python
  471. +#!/usr/bin/env python2
  472.  #
  473.  # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
  474.  #
  475. diff -Naur xen-4.0.1.orig/tools/python/xen/remus/save.py xen-4.0.1/tools/python/xen/remus/save.py
  476. --- xen-4.0.1.orig/tools/python/xen/remus/save.py       2010-10-21 11:34:50.276566332 -0700
  477. +++ xen-4.0.1/tools/python/xen/remus/save.py    2010-10-21 11:38:02.041604640 -0700
  478. @@ -1,4 +1,4 @@
  479. -#!/usr/bin/env python
  480. +#!/usr/bin/env python2
  481.  
  482.  import os, select, socket, threading, time, signal, xmlrpclib
  483.  
  484. diff -Naur xen-4.0.1.orig/tools/python/xen/remus/vm.py xen-4.0.1/tools/python/xen/remus/vm.py
  485. --- xen-4.0.1.orig/tools/python/xen/remus/vm.py 2010-10-21 11:34:50.276566332 -0700
  486. +++ xen-4.0.1/tools/python/xen/remus/vm.py      2010-10-21 11:37:59.391604677 -0700
  487. @@ -1,4 +1,4 @@
  488. -#!/usr/bin/env python
  489. +#!/usr/bin/env python2
  490.  
  491.  import xmlrpclib
  492.  
  493. diff -Naur xen-4.0.1.orig/tools/python/xen/util/bugtool.py xen-4.0.1/tools/python/xen/util/bugtool.py
  494. --- xen-4.0.1.orig/tools/python/xen/util/bugtool.py     2010-10-21 11:34:50.289902332 -0700
  495. +++ xen-4.0.1/tools/python/xen/util/bugtool.py  2010-10-21 11:38:19.948271343 -0700
  496. @@ -1,4 +1,4 @@
  497. -#!/usr/bin/env python
  498. +#!/usr/bin/env python2
  499.  
  500.  # This library is free software; you can redistribute it and/or
  501.  # modify it under the terms of version 2.1 of the GNU Lesser General Public
  502. diff -Naur xen-4.0.1.orig/tools/python/xen/util/pci.py xen-4.0.1/tools/python/xen/util/pci.py
  503. --- xen-4.0.1.orig/tools/python/xen/util/pci.py 2010-10-21 11:34:50.289902332 -0700
  504. +++ xen-4.0.1/tools/python/xen/util/pci.py      2010-10-21 11:38:24.508270159 -0700
  505. @@ -1,4 +1,4 @@
  506. -#!/usr/bin/env python
  507. +#!/usr/bin/env python2
  508.  #
  509.  # PCI Device Information Class
  510.  # - Helps obtain information about which I/O resources a PCI device needs
  511. diff -Naur xen-4.0.1.orig/tools/python/xen/util/vscsi_util.py xen-4.0.1/tools/python/xen/util/vscsi_util.py
  512. --- xen-4.0.1.orig/tools/python/xen/util/vscsi_util.py  2010-10-21 11:34:50.289902332 -0700
  513. +++ xen-4.0.1/tools/python/xen/util/vscsi_util.py       2010-10-21 11:38:18.221604787 -0700
  514. @@ -1,4 +1,4 @@
  515. -#!/usr/bin/env python
  516. +#!/usr/bin/env python2
  517.  #  -*- mode: python; -*-
  518.  
  519.  #============================================================================
  520. diff -Naur xen-4.0.1.orig/tools/python/xen/xend/arch.py xen-4.0.1/tools/python/xen/xend/arch.py
  521. --- xen-4.0.1.orig/tools/python/xen/xend/arch.py        2010-10-21 11:34:50.276566332 -0700
  522. +++ xen-4.0.1/tools/python/xen/xend/arch.py     2010-10-21 11:38:03.704936713 -0700
  523. @@ -1,4 +1,4 @@
  524. -#!/usr/bin/env python
  525. +#!/usr/bin/env python2
  526.  #
  527.  # This library is free software; you can redistribute it and/or
  528.  # modify it under the terms of version 2.1 of the GNU Lesser General Public
  529. diff -Naur xen-4.0.1.orig/tools/python/xen/xend/osdep.py xen-4.0.1/tools/python/xen/xend/osdep.py
  530. --- xen-4.0.1.orig/tools/python/xen/xend/osdep.py       2010-10-21 11:34:50.286568332 -0700
  531. +++ xen-4.0.1/tools/python/xen/xend/osdep.py    2010-10-21 11:38:15.054938247 -0700
  532. @@ -1,4 +1,4 @@
  533. -#!/usr/bin/env python
  534. +#!/usr/bin/env python2
  535.  #
  536.  # This library is free software; you can redistribute it and/or
  537.  # modify it under the terms of version 2.1 of the GNU Lesser General Public
  538. diff -Naur xen-4.0.1.orig/tools/python/xen/xend/osdep.py.orig xen-4.0.1/tools/python/xen/xend/osdep.py.orig
  539. --- xen-4.0.1.orig/tools/python/xen/xend/osdep.py.orig  2010-10-21 11:34:50.286568332 -0700
  540. +++ xen-4.0.1/tools/python/xen/xend/osdep.py.orig       2010-10-21 11:38:12.954937852 -0700
  541. @@ -1,4 +1,4 @@
  542. -#!/usr/bin/env python
  543. +#!/usr/bin/env python2
  544.  #
  545.  # This library is free software; you can redistribute it and/or
  546.  # modify it under the terms of version 2.1 of the GNU Lesser General Public
  547. diff -Naur xen-4.0.1.orig/tools/python/xen/xend/sxp.py xen-4.0.1/tools/python/xen/xend/sxp.py
  548. --- xen-4.0.1.orig/tools/python/xen/xend/sxp.py 2010-10-21 11:34:50.279900332 -0700
  549. +++ xen-4.0.1/tools/python/xen/xend/sxp.py      2010-10-21 11:38:09.248271388 -0700
  550. @@ -1,4 +1,4 @@
  551. -#!/usr/bin/env python
  552. +#!/usr/bin/env python2
  553.  #============================================================================
  554.  # This library is free software; you can redistribute it and/or
  555.  # modify it under the terms of version 2.1 of the GNU Lesser General Public
create a new version of this paste RAW Paste Data