[jhbuild] Fix installation of tracker error "Not a directory"



commit 7f32be6af7b0c7d6f0233e2647b06ee3561b973d
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Thu Apr 12 14:44:29 2012 +0200

    Fix installation of tracker error "Not a directory"
    
      File "/home/elmarco/src/jhbuild/jhbuild/modtypes/__init__.py", line 228, in _process_install_files
        os.rmdir(src_path)
    OSError: [Errno 20] Not a directory: '/opt/gnome/_jhbuild/root-tracker/opt/gnome/lib/firefox-11.0/extensions/trackerfox bustany org'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673987

 jhbuild/modtypes/__init__.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 62bd9aa..5e7ddc5 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -225,7 +225,10 @@ them into the prefix."""
                 else:
                     os.mkdir(dest_path)
                 num_copied += self._process_install_files(installroot, src_path, prefix)
-                os.rmdir(src_path)
+                if os.path.islink(src_path):
+                    os.unlink(src_path)
+                else:
+                    os.rmdir(src_path)
             else:
                 num_copied += 1
                 try:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]