[arch-projects] [devtools] [PATCH] commitpkg: Fix rsync(1) invocation when using epoch
Reintroduce what we fixed in 08a68bb4a02376905be136d3cafb14bc7cbc3098 and reverted in 2d79191c97e8ee965bfea1feef03de26c839dc8a. rsync(1) source files that contain colons (":") need to be prefixed with "./" to ensure rsync(1) doesn't interpret them as remote modules. The conditional branching is needed since we might use "$PKGDEST" (resulting in absolute package paths). Reported-by: Alexander Rødseth <rodseth@gmail.com> Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- commitpkg.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/commitpkg.in b/commitpkg.in index bf3a5ab..1d71ada 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -15,7 +15,11 @@ getpkgfile() { ;; esac - echo "$1" + if [[ $1 == /* ]]; then + echo "$1" + else + echo "./$1" + fi } # Source makepkg.conf; fail if it is not found -- 1.7.8.4
On Fri, Jan 27, 2012 at 09:50:50PM +0100, Lukas Fleischer wrote:
Reintroduce what we fixed in 08a68bb4a02376905be136d3cafb14bc7cbc3098 and reverted in 2d79191c97e8ee965bfea1feef03de26c839dc8a. rsync(1) source files that contain colons (":") need to be prefixed with "./" to ensure rsync(1) doesn't interpret them as remote modules.
The conditional branching is needed since we might use "$PKGDEST" (resulting in absolute package paths).
Reported-by: Alexander Rødseth <rodseth@gmail.com> Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- commitpkg.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
Florian already fixed this... Just ignore this one *sigh*
diff --git a/commitpkg.in b/commitpkg.in index bf3a5ab..1d71ada 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -15,7 +15,11 @@ getpkgfile() { ;; esac
- echo "$1" + if [[ $1 == /* ]]; then + echo "$1" + else + echo "./$1" + fi }
# Source makepkg.conf; fail if it is not found -- 1.7.8.4
participants (1)
-
Lukas Fleischer