Fix incomplete push

This commit is contained in:
Oleksii Shevchuk 2018-10-19 17:58:44 +03:00
parent 4a68111ad6
commit 07c95e29c5
2 changed files with 3 additions and 4 deletions

View File

@ -56,8 +56,8 @@ def output_format(file, windows=False, archive=None, time=False, uid_len=0, gid_
out = u' {}{}{}{}{}{}{}'.format(
timestamp_field.format(file_timestamp(file[T_TIMESTAMP], time)),
u'{:<2}'.format(file[T_TYPE] + ('+' if file[T_HAS_XATTR] else '')),
as_unicode(file[T_UID]).rjust(uid_len+1)+' ',
as_unicode(file[T_GID]).rjust(gid_len+1)+' ',
to_utf8(file[T_UID]).rjust(uid_len+1)+' ',
to_utf8(file[T_GID]).rjust(gid_len+1)+' ',
u'{:04o} '.format(file[T_MODE] & 0o7777),
u'{:>9}'.format(size_human_readable(file[T_SIZE])),
u' {:<40}'.format(name))

View File

@ -39,8 +39,7 @@ T_HAS_XATTR = 14
textchars = bytearray({7,8,9,10,12,13,27} | set(range(0x20, 0x100)) - {0x7f})
from fsutils import (
readlink, lstat, has_xattrs,
uidgid, getacls, getcaps
readlink, lstat, has_xattrs, uidgid
)
def is_binary(text):