From 3ebda62f04342ea362d05d88c13500d4a3f6f040 Mon Sep 17 00:00:00 2001 From: Jake Guffey Date: Wed, 22 Feb 2012 12:41:45 -0500 Subject: [PATCH 1/2] bugfix -- needed to pass '-r' to ${add_cmd} to retreive package from remote repository. --- conf/type/__package_pkg_freebsd/gencode-remote | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/type/__package_pkg_freebsd/gencode-remote b/conf/type/__package_pkg_freebsd/gencode-remote index fa962970..ef6632c0 100755 --- a/conf/type/__package_pkg_freebsd/gencode-remote +++ b/conf/type/__package_pkg_freebsd/gencode-remote @@ -107,7 +107,7 @@ if [ -n "$curr_version" ]; then # PKG *is* installed assert "! ${version} = ${curr_version}" $LINENO cmd="${rm_cmd} ${name}-${curr_version}" execcmd "remove" "${cmd}" - cmd="${add_cmd} ${name}-${version}" + cmd="${add_cmd} -r ${name}-${version}" execcmd "add" "${cmd}" fi else # Don't care what version to use From 5dc8d305e53f8f34023c439cea19ead9704ab02b Mon Sep 17 00:00:00 2001 From: Jake Guffey Date: Mon, 5 Mar 2012 14:57:37 -0500 Subject: [PATCH 2/2] Bugfix Modified pipeline to determine ${name}'s version if it's installed. --- conf/type/__package_pkg_freebsd/explorer/pkg_version | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/type/__package_pkg_freebsd/explorer/pkg_version b/conf/type/__package_pkg_freebsd/explorer/pkg_version index 4bca24b6..1335ba79 100755 --- a/conf/type/__package_pkg_freebsd/explorer/pkg_version +++ b/conf/type/__package_pkg_freebsd/explorer/pkg_version @@ -30,6 +30,10 @@ fi # Don't produce "no pkgs installed" output -- breaks things PKG_OUTPUT=$(pkg_info 2>&1) if [ ! "$PKG_OUTPUT" = "pkg_info: no packages installed" ]; then - echo "$(echo "$PKG_OUTPUT" | grep "^$name-" | cut '-d ' -f1 | sed "s/$name-//g")" + echo -n "$(echo "$PKG_OUTPUT" \ + | awk '{print $1}' \ + | sed 's/^\(.*\)-\([^-]*\)$/name:\1 ver:\2/g' \ + | grep "name:$name ver:" \ + | sed 's/^.*ver:\(.*\)/\1/g')" fi