1.1 --- a/moinsetup.py Thu Dec 13 01:10:19 2012 +0100
1.2 +++ b/moinsetup.py Wed Dec 19 00:54:18 2012 +0100
1.3 @@ -587,6 +587,24 @@
1.4 else:
1.5 return url_path
1.6
1.7 + def _set_pythonpath(self):
1.8 + path = os.environ.get("PYTHONPATH", "")
1.9 +
1.10 + conf_dir = self.get_wikiconfig_directory()
1.11 +
1.12 + if path:
1.13 + os.environ["PYTHONPATH"] = path + ":" + self.prefix_site_packages + ":" + conf_dir
1.14 + else:
1.15 + os.environ["PYTHONPATH"] = self.prefix_site_packages + ":" + conf_dir
1.16 +
1.17 + return path
1.18 +
1.19 + def _reset_pythonpath(self, path):
1.20 + if path:
1.21 + os.environ["PYTHONPATH"] = path
1.22 + else:
1.23 + del os.environ["PYTHONPATH"]
1.24 +
1.25 def get_moin_version(self):
1.26
1.27 "Return the MoinMoin version."
1.28 @@ -988,21 +1006,13 @@
1.29 email = raw_input("E-mail address: ")
1.30 password = getpass("Password: ")
1.31
1.32 - path = os.environ.get("PYTHONPATH", "")
1.33 -
1.34 - if path:
1.35 - os.environ["PYTHONPATH"] = path + ":" + self.common_dir
1.36 - else:
1.37 - os.environ["PYTHONPATH"] = self.common_dir
1.38 + path = self._set_pythonpath()
1.39
1.40 cmd = "%s --config-dir='%s' account create --name='%s' --email='%s' --password='%s'" % (
1.41 self.get_moin_script(), self.common_dir, self.superuser, email, password)
1.42 os.system(cmd)
1.43
1.44 - if path:
1.45 - os.environ["PYTHONPATH"] = path
1.46 - else:
1.47 - del os.environ["PYTHONPATH"]
1.48 + self._reset_pythonpath(path)
1.49
1.50 def make_site_files(self):
1.51
1.52 @@ -1539,23 +1549,11 @@
1.53 Install a package from the file with the given 'package_filename'.
1.54 """
1.55
1.56 - path = os.environ.get("PYTHONPATH", "")
1.57 -
1.58 - conf_dir = self.get_wikiconfig_directory()
1.59 -
1.60 - if path:
1.61 - os.environ["PYTHONPATH"] = path + ":" + self.prefix_site_packages + ":" + conf_dir
1.62 - else:
1.63 - os.environ["PYTHONPATH"] = self.prefix_site_packages + ":" + conf_dir
1.64 -
1.65 + path = self._set_pythonpath()
1.66 installer = join(self.prefix_site_packages, "MoinMoin", "packages.py")
1.67 cmd = "%s %s i %s" % (sys.executable, installer, package_filename)
1.68 os.system(cmd)
1.69 -
1.70 - if path:
1.71 - os.environ["PYTHONPATH"] = path
1.72 - else:
1.73 - del os.environ["PYTHONPATH"]
1.74 + self._reset_pythonpath(path)
1.75
1.76 def show_methods():
1.77 print "Methods:"