openbsd-ports/net/nmap/patches/patch-zenmap_setup_py
giovanni 7cc1504616 Major update to 6.01
tests & ok benoit@, thanks
2012-07-16 07:39:31 +00:00

51 lines
1.8 KiB
Plaintext

$OpenBSD: patch-zenmap_setup_py,v 1.9 2012/07/16 07:39:31 giovanni Exp $
--- zenmap/setup.py.orig Sat May 19 21:32:08 2012
+++ zenmap/setup.py Fri May 25 09:30:41 2012
@@ -202,12 +202,11 @@ class my_install(install):
install.finalize_options(self)
def run(self):
+ self.fix_paths()
install.run(self)
self.set_perms()
self.set_modules_path()
- self.fix_paths()
- self.create_uninstaller()
self.write_installed_files()
def get_installed_files(self):
@@ -360,17 +359,10 @@ for dir in dirs:
# See $(nmapdatadir) in nmap/Makefile.in.
"NMAPDATADIR": os.path.join(self.saved_prefix, "share", "nmap"),}
- # Find and read the Paths.py file.
- pcontent = ""
paths_file = os.path.join("zenmapCore", "Paths.py")
- installed_files = self.get_outputs()
- for f in installed_files:
- if re.findall("(%s)" % re.escape(paths_file), f):
- paths_file = f
- pf = open(paths_file)
- pcontent = pf.read()
- pf.close()
- break
+ pf = open(paths_file)
+ pcontent = pf.read()
+ pf.close()
# Replace the path definitions.
for path, replacement in interesting_paths.items():
@@ -391,11 +383,6 @@ for dir in dirs:
desktop_filename = None
root_desktop_filename = None
- for f in installed_files:
- if re.search("%s$" % re.escape("zenmap-root.desktop"), f):
- root_desktop_filename = f
- elif re.search("%s$" % re.escape("zenmap.desktop"), f):
- desktop_filename = f
if desktop_filename is not None:
df = open(desktop_filename, "r")