[Pkg-bazaar-commits] ./bzr-gtk/unstable r435: Merge with trunk

[Aaron Bentley]

------------------------------------------------------------
revno: 435
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: gtk-applymerge
timestamp: Mon 2008-03-03 21:45:11 +0000
message:
  Merge with trunk
modified:
  olive-gtk
  olive/__init__.py
  olive/guifiles.py
  setup.py
    ------------------------------------------------------------
    revno: 423.1.19
    committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
    branch nick: trunk
    timestamp: Mon 2008-03-03 16:44:44 +0100
    message:
      Merged Aaron Bentley's patch handler.
    added:
      handle-patch
    modified:
      __init__.py
      diff.py
    ------------------------------------------------------------
    revno: 423.1.20
    committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
    branch nick: trunk
    timestamp: Mon 2008-03-03 17:05:53 +0000
    message:
      Fix for #137172 (thanks to Mario del Pozo).
    modified:
      olive/guifiles.py
    ------------------------------------------------------------
    revno: 423.1.21
    committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
    branch nick: bug136432
    timestamp: Mon 2008-03-03 17:24:22 +0000
    message:
      Installing an olive package is pretty useless. (Fixed: #136432)
    modified:
      olive-gtk
      setup.py
    ------------------------------------------------------------
    revno: 423.1.22
    committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
    branch nick: trunk
    timestamp: Mon 2008-03-03 18:28:40 +0000
    message:
      Merge the fix for #125932
    modified:
      olive/__init__.py
        ------------------------------------------------------------
        revno: 423.12.1
        committer: Farkas Szilveszter <szilveszter at szilveszter-desktop>
        branch nick: bug125932
        timestamp: Mon 2008-03-03 18:46:23 +0100
        message:
          A fix for the bad symlinks bug.
        modified:
          olive/__init__.py
-------------- next part --------------
=== modified file 'olive-gtk'
--- a/olive-gtk	2007-08-12 16:12:33 +0000
+++ b/olive-gtk	2008-03-03 17:24:22 +0000
@@ -90,6 +90,6 @@
 import bzrlib.plugins.gtk.ui as ui
 bzrlib.ui.ui_factory = ui.GtkUIFactory()
 
-from olive import OliveGtk
+from bzrlib.plugins.gtk.olive import OliveGtk
 app = OliveGtk()
 gtk.main()

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-02-13 15:29:23 +0000
+++ b/olive/__init__.py	2008-03-03 17:46:23 +0000
@@ -965,7 +965,13 @@
         
         # Add'em to the ListStore
         for item in dirs:
-            statinfo = os.stat(self.path + os.sep + item)
+            try:
+                statinfo = os.stat(self.path + os.sep + item)
+            except OSError, e:
+                if e.errno == 40:
+                    continue
+                else:
+                    raise
             liststore.append([ gtk.STOCK_DIRECTORY,
                                True,
                                item,
@@ -1026,7 +1032,13 @@
             else:
                 st = _('unknown')
             
-            statinfo = os.stat(self.path + os.sep + item)
+            try:
+                statinfo = os.stat(self.path + os.sep + item)
+            except OSError, e:
+                if e.errno == 40:
+                    continue
+                else:
+                    raise
             liststore.append([gtk.STOCK_FILE,
                               False,
                               item,

=== modified file 'olive/guifiles.py'
--- a/olive/guifiles.py	2007-04-19 21:30:38 +0000
+++ b/olive/guifiles.py	2008-03-03 17:05:53 +0000
@@ -22,6 +22,7 @@
                   "/usr/local/share/olive/olive.glade",
                   "/opt/share/olive/olive.glade",
                   "/opt/local/share/olive/olive.glade",
+                  "~/share/olive/olive.glade",
                  ]
 
 # Get the glade file name
@@ -36,6 +37,7 @@
 GLADEFILENAME = None
 
 for path in GLADEFILENAMES:
+    path = os.path.expanduser(path)
     if os.path.isfile(path):
         GLADEFILENAME = path
         break

=== modified file 'setup.py'
--- a/setup.py	2008-02-13 08:53:14 +0000
+++ b/setup.py	2008-03-03 17:24:22 +0000
@@ -102,7 +102,6 @@
         "bzrlib.plugins.gtk.branchview": "branchview",
         },
     packages = [
-        "olive",
         "bzrlib.plugins.gtk",
         "bzrlib.plugins.gtk.viz",
         "bzrlib.plugins.gtk.annotate",