Permalink
Browse files

Get the PBI prog version after massaging PBI_MAKEPORT

  • Loading branch information...
1 parent d127819 commit 89fa2246e3c6c47990a77ffc70cf3e222ad96802 @kmoore134 kmoore134 committed Nov 29, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 src-sh/pbi-manager10/pbi-manager
@@ -1679,7 +1679,7 @@ get_pbi_progversion() {
export PBI_PROGVERSION
return 0
fi
- exit_err "Failed to get PBI_PROGVERSION"
+ exit_err "Failed to get PBI_PROGVERSION for ${PBI_MAKEPORT}"
fi
# Get the version from ports
@@ -6187,9 +6187,6 @@ start_next_ab_target()
_cd=$(dirname $pbi | sed 's|./||')
PBI_CONFDIR="$_cd"
- # Get the prog version
- get_pbi_progversion
-
if [ -z "${PBI_MAKEPORT}" ] ; then
PBI_MAKEPORT=$(dirname $pbi | sed 's|./||')
fi
@@ -6200,6 +6197,9 @@ start_next_ab_target()
PBI_MAKEPORT="`echo $PBI_MAKEPORT | sed 's|/$||g'`"
fi
+ # Get the prog version
+ get_pbi_progversion
+
if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD" ] ; then
ttag="package"
else

0 comments on commit 89fa224

Please sign in to comment.