From 099672c7dcf309a8ad100b2932a8d4470d08c7e1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 22 Oct 2018 17:39:46 +0000 Subject: find_orphans.py: fix encodings --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/find_orphans.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index c83c19a..348996b 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.5.2 -pkgrel=2 +pkgrel=3 arch=('x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -128,7 +128,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' 'dedd3fcb1abec6361f4060d8149c7d6d' '8b0298f70f97cc1dc2a58b9a73c64bd3' 'd2f1bec810a740885d9c0a2893186587' - 'e30bf8ec8b9dcc2ceb7127375a91d8d1' + 'c7b9435ae87d72f1179778c373dc43f9' 'a8bbc553cd784ebed2197b96b60addc8' 'a94fe6d980f4b810f2e2ae5352084b39' '0d1632ea63d8145c173c6aecf0b007f0' diff --git a/abs/core/LinHES-system/find_orphans.py b/abs/core/LinHES-system/find_orphans.py index b1d78de..3c6cc46 100644 --- a/abs/core/LinHES-system/find_orphans.py +++ b/abs/core/LinHES-system/find_orphans.py @@ -24,7 +24,7 @@ class File( str ): self.size = int(size) def pprint(self): name = u'%s: %s' % (self.host, os.path.join(self.path, self)) - print u' {0:<90}{1:>8}'.format(name, human_size(self.size)) + print u' {0:<90}{1:>8}'.format(name, human_size(self.size)).encode('utf-8') def delete(self): be = MythBE(self.host, db=DB) be.deleteFile(self, self.group) @@ -35,20 +35,20 @@ class MyRecorded( Recorded ): name = u'{0.hostname}: {0.title}'.format(self) if self.subtitle: name += u' - '+self.subtitle - print u' {0:<70}{1:>28}'.format(name,self.basename) + print u' {0:<70}{1:>28}'.format(name,self.basename).encode('utf-8') def printrecs(title, recs): print title for rec in sorted(recs, key=lambda x: x.title): rec.pprint() - print u'{0:>88}{1:>12}'.format('Count:',len(recs)) + print u'{0:>87}{1:>12}'.format('Count:',len(recs)).encode('utf-8') def printfiles(title, files): print title for f in sorted(files, key=lambda x: x.path): f.pprint() size = sum([f.size for f in files]) - print u'{0:>88}{1:>12}'.format('Total:',human_size(size)) + print u'{0:>87}{1:>12}'.format('Total:',human_size(size)).encode('utf-8') def populate(host=None): unfiltered = [] -- cgit v0.12