diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-19 10:14:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-19 10:14:13 +0000 |
| commit | 698cfe955f2499d6f2ad0e32e32bb150cd4283ba (patch) | |
| tree | 737535997d8d54511bebfb58585b1832bd445eb7 /pym/portage/getbinpkg.py | |
| parent | 61917cad53f2eaf9139d32b69c1a33a50cdf2a69 (diff) | |
| download | portage-698cfe955f2499d6f2ad0e32e32bb150cd4283ba.tar.gz portage-698cfe955f2499d6f2ad0e32e32bb150cd4283ba.tar.bz2 portage-698cfe955f2499d6f2ad0e32e32bb150cd4283ba.zip | |
For compatibility with python-3.0, always open streams for pickles in binary
mode.
svn path=/main/trunk/; revision=12641
Diffstat (limited to 'pym/portage/getbinpkg.py')
| -rw-r--r-- | pym/portage/getbinpkg.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index d42b51781..89252d4b8 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -471,6 +471,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= keepconnection = 1 cache_path = "/var/cache/edb" + metadatafilename = os.path.join(cache_path, 'remote_metadata.pickle') if makepickle is None: makepickle = "/var/cache/edb/metadata.idx.most_recent" @@ -485,7 +486,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= out = sys.stdout try: - metadatafile = open("/var/cache/edb/remote_metadata.pickle") + metadatafile = open(metadatafilename, 'rb') metadata = pickle.load(metadatafile) out.write("Loaded metadata pickle.\n") out.flush() @@ -574,7 +575,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= sys.stderr.write("!!! "+str(e)+"\n") sys.stderr.flush() try: - metadatafile = open("/var/cache/edb/remote_metadata.pickle", "w+") + metadatafile = open(metadatafilename, 'wb') pickle.dump(metadata,metadatafile) metadatafile.close() except SystemExit, e: @@ -666,11 +667,11 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= try: if "modified" in metadata[baseurl] and metadata[baseurl]["modified"]: metadata[baseurl]["timestamp"] = int(time.time()) - metadatafile = open("/var/cache/edb/remote_metadata.pickle", "w+") + metadatafile = open(metadatafilename, 'wb') pickle.dump(metadata,metadatafile) metadatafile.close() if makepickle: - metadatafile = open(makepickle, "w") + metadatafile = open(makepickle, 'wb') pickle.dump(metadata[baseurl]["data"],metadatafile) metadatafile.close() except SystemExit, e: |