Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* use None for filesize if can't read

Browse Source 
* get_file_hashes: warn if we're ignoring directory
This commit is contained in:
Eray Özkural
2005-10-25 09:55:33 +00:00
parent 95fee7b01f
commit c578d4c879
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+1 -1
View File
@@ -375,7 +375,7 @@ class Builder:
try: # broken links can cause problem try: # broken links can cause problem
fsize = str(os.path.getsize(fpath)) fsize = str(os.path.getsize(fpath))
except OSError: except OSError:
fsize = "0" fsize = None
d[frpath] = FileInfo(frpath, ftype, fsize, fhash) d[frpath] = FileInfo(frpath, ftype, fsize, fhash)
for (p, fileinfo) in d.iteritems(): for (p, fileinfo) in d.iteritems():
files.append(fileinfo) files.append(fileinfo)
pisi/files.py
-2
View File
@@ -67,8 +67,6 @@ class FileInfo:
err = Checks() err = Checks()
err.has_tag(self.path, "File", "Path") err.has_tag(self.path, "File", "Path")
err.has_tag(self.type, "File", "Type") err.has_tag(self.type, "File", "Type")
err.has_tag(self.size, "File", "Size")
#err.has_tag(self.hash, "File", "SHA1Sum")
return err.list return err.list
def __str__(self): def __str__(self):
pisi/util.py
+4 -2
View File
@@ -282,8 +282,10 @@ def get_file_hashes(top, exclude_prefix=None, removePrefix=None):
except FileError, e: except FileError, e:
if os.path.islink(f): if os.path.islink(f):
ctx.ui.warning(_('Ignoring "external" link %s') % f) ctx.ui.warning(_('Ignoring "external" link %s') % f)
# else: elif os.path.isdir(f):
# raise e ctx.ui.warning(_('Ignoring directory %s') % f)
else:
raise e
return None return None
# also handle single files # also handle single files