openbsd_pkg: sync package_latest().

This diff syncs package_latest() with the changes to package_present().
I have not managed to figure out how to handle the cornercases where
stderr is set but the command has not failed, so leave a FIXME blob for
other adventurers.
reviewable/pr18780/r1
Patrik Lundin 12 years ago
parent 8646df0a1f
commit 023711bb2c

@ -183,16 +183,24 @@ def package_latest(name, installed_state, specific_version, module):
else: else:
changed = False changed = False
# 'pkg_add -u' returns 0 even when something strange happened, stderr # FIXME: This part is problematic. Based on the issues mentioned (and
# should be empty if everything went fine. # handled) in package_present() it is not safe to blindly trust stderr
if stderr: # as an indicator that the command failed, and in the case with
rc=1 # empty installpath directories this will break.
#
# For now keep this safeguard here, but ignore it if we managed to
# parse out a successful update above. This way we will report a
# successful run when we actually modify something but fail
# otherwise.
if changed != True:
if stderr:
rc=1
return (rc, stdout, stderr, changed) return (rc, stdout, stderr, changed)
else: else:
# If package was not installed at all just make it present. # If package was not installed at all just make it present.
return package_present(name, installed_state, module) return package_present(name, installed_state, specific_version, module)
# Function used to make sure a package is not installed. # Function used to make sure a package is not installed.
def package_absent(name, installed_state, module): def package_absent(name, installed_state, module):

Loading…
Cancel
Save