[Piuparts-commits] rev 106 - / trunk

[Lars Wirzenius]

Author: lars
Date: 2007-11-08 20:22:10 +0000 (Thu, 08 Nov 2007)
New Revision: 106

Modified:
   /
   trunk/piuparts.py
Log:
Merged in temporary branch (via bzr-svn) to fix reporting of broken symlinks.


Property changes on: 
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-11-05 23:29:29.355000019 +0200
committer: Lars Wirzenius <liw at iki.fi>
properties: 
	branch-nick: piuparts.upstream

   + timestamp: 2007-11-08 22:20:16.061000109 +0200
committer: Lars Wirzenius <liw at iki.fi>
properties: 
	branch-nick: piuparts.upstream

Name: bzr:ancestry:v3-none
   - liw at iki.fi-20071105201927-x9hsrn0rzn1ojjwd
liw at iki.fi-20071105212614-utwqgghd1c996gg6

   + liw at iki.fi-20071105201927-x9hsrn0rzn1ojjwd
liw at iki.fi-20071105212614-utwqgghd1c996gg6
liw at iki.fi-20071108201837-pwscbj9iiwm8h41o

Name: bzr:revision-id:v3-none
   - 104 liw at iki.fi-20071105202024-ahct8ts13awaqfku
105 liw at iki.fi-20071105212653-ttr3062izcfvnyj7
106 liw at iki.fi-20071105212929-y8o8937i99hqouad

   + 104 liw at iki.fi-20071105202024-ahct8ts13awaqfku
105 liw at iki.fi-20071105212653-ttr3062izcfvnyj7
106 liw at iki.fi-20071105212929-y8o8937i99hqouad
107 liw at iki.fi-20071108202016-kb4x591yu6kxbt03


Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2007-11-05 21:29:57 UTC (rev 105)
+++ trunk/piuparts.py	2007-11-08 20:22:10 UTC (rev 106)
@@ -824,12 +824,16 @@
             if dirpath == self.name and "proc" in dirnames:
                 dirnames.remove("proc")
             for filename in filenames:
-                name = os.path.join(dirpath, filename)
+                full_name = name = os.path.join(dirpath, filename)
                 if name.startswith(self.name):
                     name = name[len(self.name):]
                 ret = is_broken_symlink(self.name, dirpath, filename)
                 if ret and not self.is_ignored(name):
-                    broken.append("%s -> %s" % (name, ret))
+                    try:
+                        target = os.readlink(full_name)
+                    except os.error:
+                        target = "<unknown>"
+                    broken.append("%s -> %s" % (name, os.readlink(name)))
         if broken:
             logging.error("Broken symlinks:\n%s" % 
                           indent_string("\n".join(broken)))