[adios] 194/207: WIP: try fix python3 patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 3a40a4fac93f1f42f452e5c7e6fd6d6ddc6ce5bd
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun May 3 12:53:19 2015 +0100
WIP: try fix python3 patch
---
debian/patches/python3.patch | 53 --------------------------------------------
1 file changed, 53 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 56e8a1c..50d23bc 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -780,56 +780,3 @@ Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
if path.startswith('-L'):
m1.library_dirs.append(path.replace('-L', '', 1))
if path.startswith('-l'):
-Index: adios-1.8.0/utils/skel/bin/skel
-===================================================================
---- adios-1.8.0.orig/utils/skel/bin/skel
-+++ adios-1.8.0/utils/skel/bin/skel
-@@ -1,5 +1,7 @@
- #!/usr/bin/env python
-
-+from __future__ import absolute_import, division, print_function, unicode_literals
-+
- import sys
- import os.path
-@@ -60,7 +60,7 @@ def main(argv=None):
-
- # Look fo( skel help (or no args), and print the list of subcommands...
- if (len(sys.argv) == 1) or (sys.argv[1] == 'help' and len(sys.argv) == 2):
-- print parser.description
-+ print(parser.description)
- return 0
-
- # install does not require a project, so let's just check for it directly
-@@ -85,8 +85,8 @@ def main(argv=None):
- elif sys.argv[2] == 'xml':
- sys.argv = ["skel", "xml", "junk", "-h"]
- else:
-- print "Unknown help topic"
-- print parser.description
-+ print("Unknown help topic")
-+ print(parser.description)
- exit(1)
-
- #args = parse_command_line()
-@@ -156,7 +156,7 @@ def main(argv=None):
- return 0
-
- # Unrecognized subcommand, print the help message
-- print parser.description
-+ print(parser.description)
- return 0
-
-
-Index: adios-1.8.0/utils/skel/bin/skel_extract.py
-===================================================================
---- adios-1.8.0.orig/utils/skel/bin/skel_extract.py
-+++ adios-1.8.0/utils/skel/bin/skel_extract.py
-@@ -113,7 +113,7 @@ def extract_R (skel_output, select, rank
- # check the selected fields
- for field in selected_fields:
- if not field in keys:
-- print 'Invalid selection, field ' + field
-+ print('Invalid selection, field ' + field)
- return
-
- #Print the header
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list