Rev 2883: catch bzrlib version mismatch earlier in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2883
revision-id: pqm at pqm.ubuntu.com-20071004060117-by9mnl9eubiyz572
parent: pqm at pqm.ubuntu.com-20071004052509-t4jjswwgj7a5xll7
parent: bialix at ukr.net-20071004051212-h8uns701fww3keu2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-10-04 07:01:17 +0100
message:
  catch bzrlib version mismatch earlier
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
    ------------------------------------------------------------
    revno: 2881.2.1
    merged: bialix at ukr.net-20071004051212-h8uns701fww3keu2
    parent: pqm at pqm.ubuntu.com-20071003232450-c831pepea3skddct
    parent: bialix at ukr.net-20070927124551-q3vv29cy3ubidvk1
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: trivial
    timestamp: Thu 2007-10-04 08:12:12 +0300
    message:
      merge with bzr.dev
    ------------------------------------------------------------
    revno: 2867.2.1
    merged: bialix at ukr.net-20070927124551-q3vv29cy3ubidvk1
    parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bzr.check.version
    timestamp: Thu 2007-09-27 15:45:51 +0300
    message:
      check bzrlib version early
=== modified file 'bzr'
--- a/bzr	2007-09-12 01:29:21 +0000
+++ b/bzr	2007-09-27 12:45:51 +0000
@@ -67,6 +67,12 @@
                      "\n")
     raise
 
+if bzrlib.version_info[:3] != (0, 92, 0):
+    sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
+            "This may indicate an installation problem.\n"
+            "bzrlib from %s is version %r\n"
+            % (bzrlib.__path__, bzrlib.version_info))
+
 import bzrlib.inspect_for_copy
 bzrlib.inspect_for_copy.import_copy_with_hacked_inspect()
 
@@ -88,12 +94,6 @@
 import bzrlib.commands
 import bzrlib.trace
 
-if bzrlib.version_info[:3] != (0, 92, 0):
-    sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
-            "This may indicate an installation problem.\n"
-            "bzrlib from %s is version %r\n"
-            % (bzrlib.__path__, bzrlib.version_info))
-
 if __name__ == '__main__':
     bzrlib.trace.enable_default_logging()
     exit_val = bzrlib.commands.main(sys.argv)