diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-09-26 16:23:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-09-26 16:23:32 -0400 |
commit | 67bcecbbe42c727936d825363fbd1e2173bab574 (patch) | |
tree | 4443427102b172f3963f98a6e32c76e7b1da4b1a /commitpkg.in | |
parent | 46e8d5b656945179d7dc79c6d5c93034f1495367 (diff) | |
parent | 9c85d116f0425817b4a631e7a693dc5c948e2470 (diff) | |
download | devtools32-67bcecbbe42c727936d825363fbd1e2173bab574.tar.xz |
Merge branch 'devtools' (early part)
Conflicts:
arch-nspawn.in
This effectively reverts my machine_name patch; I took a simpler route to
dealing with a working_dir with funny characters in it, using a different
scheme for the machine_name. This fixes the problems devtools' original
scheme had, so I'm going back to that.
Diffstat (limited to 'commitpkg.in')
-rw-r--r-- | commitpkg.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commitpkg.in b/commitpkg.in index ad1005b..fe9348b 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -36,7 +36,7 @@ if [[ ! -f PKGBUILD ]]; then die 'No PKGBUILD file' fi -. PKGBUILD +. ./PKGBUILD pkgbase=${pkgbase:-$pkgname} case "$cmd" in |