|
|
@ -235,7 +235,7 @@ def package_present(names, pkg_spec, module):
|
|
|
|
# "file:/local/package/directory/ is empty" message on stderr
|
|
|
|
# "file:/local/package/directory/ is empty" message on stderr
|
|
|
|
# while still installing the package, so we need to look for
|
|
|
|
# while still installing the package, so we need to look for
|
|
|
|
# for a message like "packagename-1.0: ok" just in case.
|
|
|
|
# for a message like "packagename-1.0: ok" just in case.
|
|
|
|
match = re.search("\W%s-[^:]+: ok\W" % pkg_spec[name]['stem'], pkg_spec[name]['stdout'])
|
|
|
|
match = re.search(r"\W%s-[^:]+: ok\W" % pkg_spec[name]['stem'], pkg_spec[name]['stdout'])
|
|
|
|
|
|
|
|
|
|
|
|
if match:
|
|
|
|
if match:
|
|
|
|
# It turns out we were able to install the package.
|
|
|
|
# It turns out we were able to install the package.
|
|
|
@ -286,7 +286,7 @@ def package_latest(names, pkg_spec, module):
|
|
|
|
pkg_spec[name]['changed'] = False
|
|
|
|
pkg_spec[name]['changed'] = False
|
|
|
|
for installed_name in pkg_spec[name]['installed_names']:
|
|
|
|
for installed_name in pkg_spec[name]['installed_names']:
|
|
|
|
module.debug("package_latest(): checking for pre-upgrade package name: %s" % installed_name)
|
|
|
|
module.debug("package_latest(): checking for pre-upgrade package name: %s" % installed_name)
|
|
|
|
match = re.search("\W%s->.+: ok\W" % installed_name, pkg_spec[name]['stdout'])
|
|
|
|
match = re.search(r"\W%s->.+: ok\W" % installed_name, pkg_spec[name]['stdout'])
|
|
|
|
if match:
|
|
|
|
if match:
|
|
|
|
module.debug("package_latest(): pre-upgrade package name match: %s" % installed_name)
|
|
|
|
module.debug("package_latest(): pre-upgrade package name match: %s" % installed_name)
|
|
|
|
|
|
|
|
|
|
|
@ -502,7 +502,7 @@ def upgrade_packages(pkg_spec, module):
|
|
|
|
|
|
|
|
|
|
|
|
# Try to find any occurrence of a package changing version like:
|
|
|
|
# Try to find any occurrence of a package changing version like:
|
|
|
|
# "bzip2-1.0.6->1.0.6p0: ok".
|
|
|
|
# "bzip2-1.0.6->1.0.6p0: ok".
|
|
|
|
match = re.search("\W\w.+->.+: ok\W", pkg_spec['*']['stdout'])
|
|
|
|
match = re.search(r"\W\w.+->.+: ok\W", pkg_spec['*']['stdout'])
|
|
|
|
if match:
|
|
|
|
if match:
|
|
|
|
pkg_spec['*']['changed'] = True
|
|
|
|
pkg_spec['*']['changed'] = True
|
|
|
|
|
|
|
|
|
|
|
|