[jhbuild/wip/sam/python3] Fixups for packagedb



commit df9744ba2f943bc7a67398c8dc9d1e69c8086d06
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Wed Jan 27 15:06:07 2016 +0100

    Fixups for packagedb

 jhbuild/utils/packagedb.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/utils/packagedb.py b/jhbuild/utils/packagedb.py
index e25b7da..b7924f0 100644
--- a/jhbuild/utils/packagedb.py
+++ b/jhbuild/utils/packagedb.py
@@ -60,8 +60,9 @@ class PackageEntry:
         if not os.path.exists(os.path.join(self.dirname, 'manifests', self.package)):
             return None
         self._manifest = []
-        for line in file(os.path.join(self.dirname, 'manifests', self.package)):
-            self._manifest.append(line.strip())
+        with open(os.path.join(self.dirname, 'manifests', self.package)) as f:
+            for line in f:
+                self._manifest.append(line.strip())
         return self._manifest
 
     def set_manifest(self, value):
@@ -179,7 +180,8 @@ class PackageDB:
             metadata = {}
         metadata['installed-date'] = time.time() # now
         if configure_cmd:
-            metadata['configure-hash'] = hashlib.md5(configure_cmd).hexdigest()
+            metadata['configure-hash'] = hashlib.md5(
+                configure_cmd.encode('utf-8')).hexdigest()
         pkg = PackageEntry(package, version, metadata, self.dirname)
         pkg.manifest = contents
         pkg.write()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]