summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-08-06 20:11:16 -0400
committerDave Reisner <dreisner@archlinux.org>2014-08-06 20:11:16 -0400
commit8b77c671b4596f3674ba1da53ae66fabf95ab296 (patch)
treefd80fc2f42d5c003bde1a3ef5f301c3134e9eade
parent0049934875f9cc4a7a40482767d3afb64bc5df8a (diff)
downloadasp32-8b77c671b4596f3674ba1da53ae66fabf95ab296.tar.xz
fix warnings when exporting a checked out branch
Explicitly refer to the remote branch.
-rw-r--r--package.inc.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.inc.sh b/package.inc.sh
index 63b968a..1456baf 100644
--- a/package.inc.sh
+++ b/package.inc.sh
@@ -72,7 +72,7 @@ package_export() {
subtree=trunk
fi
- if [[ -z $(git ls-tree "$remote/packages/$pkgname" "$subtree/") ]]; then
+ if [[ -z $(git ls-tree "remotes/$remote/packages/$pkgname" "$subtree/") ]]; then
if [[ $repo ]]; then
log_error "package '%s' not found in repo '%s-%s'" "$pkgname" "$repo" "$OPT_ARCH"
return 1
@@ -87,7 +87,7 @@ package_export() {
fi
log_info 'exporting %s:%s' "$pkgname" "$subtree"
- git archive --format=tar "$remote/packages/$pkgname" "$subtree/" |
+ git archive --format=tar "remotes/$remote/packages/$pkgname" "$subtree/" |
bsdtar -C "$startdir" -s ",^$subtree/,$pkgname/," -xf - "$subtree/"
}