Rev 2666: allow ``easy_install bzr`` runs without fatal errors. (#125521, bialix, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2666
revision-id: pqm at pqm.ubuntu.com-20070801171451-en3tds1hzlru2j83
parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
parent: bialix at ukr.net-20070801150630-yutqeweo2akutdc0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-01 18:14:51 +0100
message:
  allow ``easy_install bzr`` runs without fatal errors. (#125521, bialix,
   r=mbp)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 2662.1.1
    merged: bialix at ukr.net-20070801150630-yutqeweo2akutdc0
    parent: pqm at pqm.ubuntu.com-20070731031231-iqrudv126086qgsa
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bzr.easy_install
    timestamp: Wed 2007-08-01 18:06:30 +0300
    message:
      allow ``easy_install bzr`` runs without fatal errors. (Alexander Belchenko, #125521)
=== modified file 'NEWS'
--- a/NEWS	2007-07-31 05:10:59 +0000
+++ b/NEWS	2007-08-01 17:14:51 +0000
@@ -35,6 +35,9 @@
     * ``bzr add *`` no more fails on Windows if working tree contains
       non-ascii file names. (Kuno Meyer, #127361)
 
+    * allow ``easy_install bzr`` runs without fatal errors. 
+      (Alexander Belchenko, #125521)
+
   IMPROVEMENTS:
 
     * Don't show "dots" progress indicators when run non-interactively, such

=== modified file 'setup.py'
--- a/setup.py	2007-07-18 20:42:38 +0000
+++ b/setup.py	2007-08-01 15:06:30 +0000
@@ -103,13 +103,13 @@
 
         if sys.platform == "win32":
             try:
-                scripts_dir = self.install_dir
+                scripts_dir = os.path.join(sys.prefix, 'Scripts')
                 script_path = self._quoted_path(os.path.join(scripts_dir,
                                                              "bzr"))
                 python_exe = self._quoted_path(sys.executable)
                 args = self._win_batch_args()
                 batch_str = "@%s %s %s" % (python_exe, script_path, args)
-                batch_path = script_path + ".bat"
+                batch_path = os.path.join(self.install_dir, "bzr.bat")
                 f = file(batch_path, "w")
                 f.write(batch_str)
                 f.close()
@@ -283,9 +283,15 @@
           zipfile='lib/library.zip')
 
 else:
+    # ad-hoc for easy_install
+    DATA_FILES = []
+    if not 'bdist_egg' in sys.argv:
+        # generate and install bzr.1 only with plain install, not easy_install one
+        DATA_FILES = [('man/man1', ['bzr.1'])]
+
     # std setup
     ARGS = {'scripts': ['bzr'],
-            'data_files': [('man/man1', ['bzr.1'])],
+            'data_files': DATA_FILES,
             'cmdclass': command_classes,
             'ext_modules': ext_modules,
            }