Rev 4345: (jam) Better error when looking for TortoiseOverlays. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Fri May 8 18:03:04 BST 2009

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

------------------------------------------------------------
revno: 4345
revision-id: pqm at pqm.ubuntu.com-20090508170256-u5k6lfa0n93h9obf
parent: pqm at pqm.ubuntu.com-20090508150714-jzf02vqlrcang974
parent: john at arbash-meinel.com-20090508152744-x8j8itnnrj6rnj0i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-05-08 18:02:56 +0100
message:
  (jam) Better error when looking for TortoiseOverlays.
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 4343.2.1
    revision-id: john at arbash-meinel.com-20090508152744-x8j8itnnrj6rnj0i
    parent: pqm at pqm.ubuntu.com-20090507174741-gavb04vy1c6s0w9n
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2009-05-08 10:27:44 -0500
    message:
      Give a better error message when we cannot find the TortoiseOverlays files.
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'setup.py'

--- a/setup.py	2009-04-09 20:23:07 +0000
+++ b/setup.py	2009-05-08 15:27:44 +0000
@@ -602,14 +602,20 @@
         # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
         # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
         # can be downloaded from (username=guest, blank password):
-        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
+        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
+        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
         # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
         for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
                        'TORTOISE_OVERLAYS_MSI_X64'):
+            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
+                   '/TortoiseOverlays')
             if not os.path.isfile(os.environ.get(needed, '<nofile>')):
-                raise RuntimeError("Please set %s to the"
-                                   " location of the relevant TortoiseOverlays"
-                                   " .msi installer file" % needed)
+                raise RuntimeError(
+                    "\nPlease set %s to the location of the relevant"
+                    "\nTortoiseOverlays .msi installer file."
+                    " The installers can be found at"
+                    "\n  %s"
+                    "\ncheck in the version-X.Y.Z/bin/ subdir" % (needed, url))
         get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
                              gui_targets, data_files)
     else:


