Skip to content

Commit

Permalink
remove duplicated args
Browse files Browse the repository at this point in the history
  • Loading branch information
zanyou committed Nov 14, 2021
1 parent 311ab37 commit 2db549d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions manifests/pip.pp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
}

$pip_install = "${pip_env} --log ${log}/pip.log install"
$pip_common_args = "${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${source}"
$pip_common_args = "${pypi_index} ${proxy_flag} ${install_editable} ${source}"

# Explicit version out of VCS when PIP supported URL is provided
if $source =~ /^'(git\+|hg\+|bzr\+|svn\+)(http|https|ssh|svn|sftp|ftp|lp|git)(:\/\/).+'$/ {
Expand All @@ -195,7 +195,7 @@

'present': {
# Whatever version is available.
$command = "${pip_install} ${pip_common_args}"
$command = "${pip_install} ${install_args} ${pip_common_args}"
$unless_command = "${pip_env} list | grep -i -e '${grep_regex}'"
}

Expand All @@ -214,7 +214,7 @@
$grep_regex_pkgname_with_dashes = "^${pkgname_with_dashes}=="
$installed_version = join( ["${pip_env} freeze --all", " | grep -i -e ${grep_regex_pkgname_with_dashes} | cut -d= -f3", " | tr -d '[:space:]'",])

$command = "${pip_install} --upgrade ${pip_common_args}"
$command = "${pip_install} --upgrade ${install_args} ${pip_common_args}"
$unless_command = "[ \$(${latest_version}) = \$(${installed_version}) ]"
}

Expand Down

0 comments on commit 2db549d

Please sign in to comment.