Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2017-08-20 16:32:16 -0400
committerDave Reisner <dreisner@archlinux.org>2017-08-20 16:32:16 -0400
commitddbca0c7df338b3d8563175ef244ece2b5eba2af (patch)
treef8c4d85a2cd2ebbce6c217c2f9fb31bc00e82c97
parent6def64c8e0b6d6d41b8768db6d8448f8bc320bbf (diff)
simplify subtree decision making
-rw-r--r--package.inc.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/package.inc.sh b/package.inc.sh
index a0e5ce4..3a64912 100644
--- a/package.inc.sh
+++ b/package.inc.sh
@@ -103,7 +103,7 @@ package_show_file() {
}
package_list_files() {
- local remote
+ local remote subtree=trunk
pkgname=$1
if [[ $pkgname = */* ]]; then
@@ -114,8 +114,6 @@ package_list_files() {
if [[ $repo ]]; then
subtree=repos/$repo-$OPT_ARCH
- else
- subtree=trunk
fi
@@ -124,7 +122,7 @@ package_list_files() {
}
package_export() {
- local remote repo arch path
+ local remote repo arch path subtree=trunk
pkgname=$1
if [[ $pkgname = */* ]]; then
@@ -135,8 +133,6 @@ package_export() {
if [[ $repo ]]; then
subtree=repos/$repo-$OPT_ARCH
- else
- subtree=trunk
fi
if [[ -z $(git ls-tree "remotes/$remote/packages/$pkgname" "$subtree/") ]]; then