[Pkg-bazaar-commits] ./bzr/unstable r20: don't abort on trees that happen to contain symlinks

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 20
committer: mbp at sourcefrog.net
timestamp: Fri 2005-03-11 17:24:40 +1100
message:
  don't abort on trees that happen to contain symlinks
  (they still can't be versioned though).
modified:
  bzrlib/osutils.py
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2005-03-09 07:33:00 +0000
+++ b/bzrlib/osutils.py	2005-03-11 06:24:40 +0000
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import os, types, re, time, types
-from stat import S_ISREG, S_ISDIR, ST_MODE, ST_SIZE
+from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE
 
 from errors import bailout
 
@@ -51,8 +51,10 @@
         return 'file'
     elif S_ISDIR(mode):
         return 'directory'
+    elif S_ISLNK(mode):
+        return 'symlink'
     else:
-        bailout("can't handle file kind of %r" % fp)
+        bailout("can't handle file kind with mode %o of %r" % (mode, f))