$OpenBSD: patch-zenmap_setup_py,v 1.5 2008/09/17 18:09:54 kili Exp $ --- zenmap/setup.py.orig Fri Sep 12 06:41:38 2008 +++ zenmap/setup.py Tue Sep 16 08:54:24 2008 @@ -126,12 +126,11 @@ def path_strip_prefix(path, prefix): class my_install(install): 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): @@ -285,17 +284,10 @@ for dir in dirs: "MISC_DIR": os.path.join(self.prefix, misc_dir), "PIXMAPS_DIR": os.path.join(self.prefix, pixmaps_dir)} - # 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(): @@ -316,11 +308,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")