Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-29 11:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

archive: only download dsc file to the workdir from pull() method

Browse Source 
LP: #1928946
This commit is contained in:
Dan Streetman 2021-05-28 16:26:18 -04:00
parent ec36c7c792
commit a0315dac8c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ubuntutools/archive.py
View File

@ -37,6 +37,7 @@ import os.path
import re import re
import subprocess import subprocess
import sys import sys
import tempfile
from abc import (ABC, abstractmethod) from abc import (ABC, abstractmethod)
@ -52,7 +53,7 @@ from ubuntutools.lp.udtexceptions import (PackageNotFoundException,
SeriesNotFoundException, SeriesNotFoundException,
PocketDoesNotExistError, PocketDoesNotExistError,
InvalidDistroValueError) InvalidDistroValueError)
from ubuntutools.misc import (download, verify_file_checksum, verify_file_checksums) from ubuntutools.misc import (download, download_text, verify_file_checksum, verify_file_checksums)
from ubuntutools.version import Version from ubuntutools.version import Version
import logging import logging
@ -180,11 +181,7 @@ class SourcePackage(ABC):
# If provided a dscfile, process it now to set our source and version # If provided a dscfile, process it now to set our source and version
if self._dsc_source: if self._dsc_source:
filename = os.path.basename(urlparse(self._dsc_source).path) self._dsc = Dsc(download_text(self._dsc_source, mode='rb'))
dst = os.path.join(self.workdir, filename)
download(self._dsc_source, dst)
with open(dst, 'rb') as f:
self._dsc = Dsc(f.read())
self.source = self._dsc['Source'] self.source = self._dsc['Source']
self._version = Version(self._dsc['Version']) self._version = Version(self._dsc['Version'])
self._check_dsc_signature() self._check_dsc_signature()
@ -282,9 +279,13 @@ class SourcePackage(ABC):
def dsc(self): def dsc(self):
"Return the Dsc" "Return the Dsc"
if not self._dsc: if not self._dsc:
if self._dsc_source:
raise RuntimeError('Internal error: we have a dsc file but dsc not set')
urls = self._source_urls(self.dsc_name) urls = self._source_urls(self.dsc_name)
self._download_file_from_urls(urls, self.dsc_pathname) with tempfile.TemporaryDirectory() as d:
with open(self.dsc_pathname, 'rb') as f: tmpdsc = os.path.join(d, self.dsc_name)
self._download_file_from_urls(urls, tmpdsc)
with open(tmpdsc, 'rb') as f:
self._dsc = Dsc(f.read()) self._dsc = Dsc(f.read())
self._check_dsc_signature() self._check_dsc_signature()
return self._dsc return self._dsc
@ -424,6 +425,8 @@ class SourcePackage(ABC):
def pull(self): def pull(self):
"Pull into workdir" "Pull into workdir"
with open(self.dsc_pathname, 'wb') as f:
f.write(self.dsc.raw_text)
for entry in self.dsc['Files']: for entry in self.dsc['Files']:
name = entry['name'] name = entry['name']
urls = self._source_urls(name) urls = self._source_urls(name)