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

From-Import-Removal

Browse Source
This commit is contained in:
Faik Uygur
2007-04-26 08:38:15 +00:00
parent 7878e9cb91
commit f48a2a5253
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/file.py
+12 -12
View File
@@ -27,9 +27,9 @@ __trans = gettext.translation('pisi', fallback=True)
_ = __trans.ugettext _ = __trans.ugettext
import pisi import pisi
from pisi.uri import URI import pisi.uri
from pisi.util import join_path as join import pisi.util
from pisi.fetcher import fetch_url import pisi.fetcher
import pisi.context as ctx import pisi.context as ctx
class AlreadyHaveException(pisi.Exception): class AlreadyHaveException(pisi.Exception):
@@ -61,8 +61,8 @@ class File:
def make_uri(uri): def make_uri(uri):
"handle URI arg" "handle URI arg"
if type(uri) == types.StringType or type(uri) == types.UnicodeType: if type(uri) == types.StringType or type(uri) == types.UnicodeType:
uri = URI(uri) uri = pisi.uri.URI(uri)
elif not isinstance(uri, URI): elif not isinstance(uri, pisi.uri.URI):
raise Error(_("uri must have type either URI or string")) raise Error(_("uri must have type either URI or string"))
return uri return uri
@@ -93,15 +93,15 @@ class File:
def download(uri, transfer_dir = "/tmp", sha1sum = False, def download(uri, transfer_dir = "/tmp", sha1sum = False,
compress = None, sign = None, copylocal = False): compress = None, sign = None, copylocal = False):
assert isinstance(uri, URI) assert isinstance(uri, pisi.uri.URI)
if sha1sum: if sha1sum:
sha1filename = File.download(URI(uri.get_uri() + '.sha1sum'), transfer_dir) sha1filename = File.download(pisi.uri.URI(uri.get_uri() + '.sha1sum'), transfer_dir)
sha1f = file(sha1filename) sha1f = file(sha1filename)
newsha1 = sha1f.read().split("\n")[0] newsha1 = sha1f.read().split("\n")[0]
if uri.is_remote_file() or copylocal: if uri.is_remote_file() or copylocal:
localfile = join(transfer_dir, uri.filename()) localfile = pisi.util.join_path(transfer_dir, uri.filename())
# TODO: code to use old .sha1sum file, is this a necessary optimization? # TODO: code to use old .sha1sum file, is this a necessary optimization?
#oldsha1fn = localfile + '.sha1sum' #oldsha1fn = localfile + '.sha1sum'
@@ -115,10 +115,10 @@ class File:
if uri.is_remote_file(): if uri.is_remote_file():
ctx.ui.info(_("Fetching %s") % uri.get_uri(), verbose=True) ctx.ui.info(_("Fetching %s") % uri.get_uri(), verbose=True)
fetch_url(uri, transfer_dir, ctx.ui.Progress) pisi.fetcher.fetch_url(uri, transfer_dir, ctx.ui.Progress)
else: else:
# copy to transfer dir, # copy to transfer dir,
localfile = join(transfer_dir, uri.filename()) localfile = pisi.util.join_path(transfer_dir, uri.filename())
ctx.ui.info(_("Copying %s to transfer dir") % uri.get_uri(), verbose=True) ctx.ui.info(_("Copying %s to transfer dir") % uri.get_uri(), verbose=True)
shutil.copy(uri.get_uri(), transfer_dir) shutil.copy(uri.get_uri(), transfer_dir)
else: else:
@@ -127,7 +127,7 @@ class File:
raise IOError(_("File '%s' not found.") % localfile) raise IOError(_("File '%s' not found.") % localfile)
if not os.access(localfile, os.W_OK): if not os.access(localfile, os.W_OK):
oldfn = localfile oldfn = localfile
localfile = join(transfer_dir, os.path.basename(localfile)) localfile = pisi.util.join_path(transfer_dir, os.path.basename(localfile))
shutil.copy(oldfn, localfile) shutil.copy(oldfn, localfile)
if sha1sum: if sha1sum:
@@ -209,7 +209,7 @@ class File:
def check_signature(uri, transfer_dir, sign=detached): def check_signature(uri, transfer_dir, sign=detached):
if sign==File.detached: if sign==File.detached:
try: try:
sigfilename = File.download(URI(uri + '.sig'), transfer_dir) sigfilename = File.download(pisi.uri.URI(uri + '.sig'), transfer_dir)
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except Exception, e: #FIXME: what exception could we catch here, replace with that. except Exception, e: #FIXME: what exception could we catch here, replace with that.