Commit 5f8b73ff authored by Дмитрий Никулин's avatar Дмитрий Никулин Committed by Nick Yefremov

package_updates: extract package current version

parent 6ec2cba8
...@@ -15,7 +15,7 @@ APT_COMMANDS = ( ...@@ -15,7 +15,7 @@ APT_COMMANDS = (
'download', 'changelog', 'build-dep', 'full-upgrade', 'show', 'list', 'download', 'changelog', 'build-dep', 'full-upgrade', 'show', 'list',
'edit-sources' 'edit-sources'
) )
PACKAGE_REGEX = re.compile(r'^(\S+)/\S+\s(\S+)') PACKAGE_REGEX = re.compile(r'^(\S+)/\S+\s(\S+)\s\S+\s\[upgradable from: (\S+)\]')
MULTIPLE_SPACES_REGEX = re.compile(r'\s{2,}') MULTIPLE_SPACES_REGEX = re.compile(r'\s{2,}')
...@@ -43,7 +43,7 @@ class PackageUpdates(service.FunctionObject) : ...@@ -43,7 +43,7 @@ class PackageUpdates(service.FunctionObject) :
def _extract_upgradable_packages(self, apt_output): def _extract_upgradable_packages(self, apt_output):
lines = apt_output.split('\n') lines = apt_output.split('\n')
matches = [PACKAGE_REGEX.match(line) for line in lines] matches = [PACKAGE_REGEX.match(line) for line in lines]
return [[m[1], m[2]] for m in matches if m] return [[m[1], m[3], m[2]] for m in matches if m]
def _parse_apt_block(self, block): def _parse_apt_block(self, block):
fields = {} fields = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment