touches up on file.name check, part of glep31

svn path=/main/branches/2.0/; revision=2065

diff --git a/ChangeLog b/ChangeLog
index 15ccaaab26dcd316248f689d73eceff68913778c..afc6080db32c9c59c5fb7018bf1c5da1325e6e14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+  01 Oct 2005; Brian Harring <ferringb@gentoo.org> bin/repoman:
+  Touch ups to file.name check.
+
   01 Oct 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild, 
   pym/portage.py:
   Fixed ebuild some-ebuild setup unpack so it functions like

diff --git a/bin/repoman b/bin/repoman
index 62e7852f34de009f410d488076442422ce485926..4b813a3a121bf0f11aca68fbd832d2b3f48c7b59 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -835,10 +835,10 @@ for x in scanlist:
                                stats["file.size"] += 1
                                fails["file.size"].append("("+ str(mystat.st_size/1024) + "K) "+x+"/files/"+y)
 
-                       for c in y.strip(os.path.sep):
+                       for c in os.path.basename(y.rstrip(os.path.sep)):
                                if c not in allowed_filename_chars_set:
                                        stats["file.name"] += 1
-                                       fails["file.name"].append("%s/%s: char '%s'" % (checkdir, y, c))
+                                       fails["file.name"].append("%s/files/%s: char '%s'" % (checkdir, y, c))
                                        break