Rev 3317: bzr main script cannot be imported (Benjamin Peterson) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3317
revision-id:pqm at pqm.ubuntu.com-20080331043759-0a8hhft91h108mh7
parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
parent: ian.clatworthy at canonical.com-20080331030147-qw6kujrfdue15q7g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-31 05:37:59 +0100
message:
  bzr main script cannot be imported (Benjamin Peterson)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
    ------------------------------------------------------------
    revno: 3316.1.1
    revision-id:ian.clatworthy at canonical.com-20080331030147-qw6kujrfdue15q7g
    parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
    parent: musiccomposition at gmail.com-20080314022140-iwkxff9kly0vtb1a
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Mon 2008-03-31 13:01:47 +1000
    message:
      bzr main script cannot be imported (Benjamin Peterson)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
    ------------------------------------------------------------
    revno: 3275.2.1
    revision-id:musiccomposition at gmail.com-20080314022140-iwkxff9kly0vtb1a
    parent: pqm at pqm.ubuntu.com-20080314011927-hi5bdap69742g7zn
    committer: Benjamin Peterson <musiccomposition at gmail.com>
    branch nick: no-bzr-import
    timestamp: Thu 2008-03-13 21:21:40 -0500
    message:
      Made importing the bzr script raise an ImportError
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
=== modified file 'NEWS'
--- a/NEWS	2008-03-28 07:24:55 +0000
+++ b/NEWS	2008-03-31 03:01:47 +0000
@@ -12,6 +12,8 @@
 
   CHANGES:
 
+   * bzr main script cannot be imported (Benjamin Peterson)
+
    * When a plugin cannot be loaded as the file path is not a valid
      python module name bzr will now strip a ``bzr_`` prefix from the
      front of the suggested name, as many plugins (e.g. bzr-svn)
@@ -151,7 +153,7 @@
       (Alexander Belchenko)
 
     * Restore auto-detection of plink.exe on Windows. (Dmitry Vasiliev)
-
+    
     * Version number is now shown as "1.2" or "1.2pr2", without zeroed or
       missing final fields.  (Martin Pool)
 

=== modified file 'bzr'
--- a/bzr	2008-03-17 02:26:35 +0000
+++ b/bzr	2008-03-31 03:01:47 +0000
@@ -129,4 +129,4 @@
         bzrlib.trace._trace_file.flush()
     os._exit(exit_val)
 else:
-    pass    # should this give an error? - it can't be used as a lib
+    raise ImportError("The bzr script cannot be imported.")