cURL / Mailing Lists / curl-library / Single Mail

curl-library

Re: Autobuilds: Duplicate entries?

From: Guenter <lists_at_gknw.net>
Date: Tue, 13 Apr 2010 23:45:08 +0200

Hi Tor,
Tor Arntsen schrieb:
> On Apr 13, 14:33, Guenter wrote:
>> BTW. if you have some mins maybe you can take a look too into my recent
>> change to testcurl.pl? I added git update and log output for ares too,
>> I've no idea why but it seems it doesnt work although the change was
>> trivial ... (maybe I looked too long at it, and dont see the my failure).
>
> Here's the patch. Wrong directory when doing 'git pull' in ares:
hmmm ....; probably I better should have checked with a print where
$CURLDIR points to - but I thought we are actually inside $CURLDIR, so
the test for $CURLDIR/ares should work ....

>>From 35896641254537a755816dd53b3d0d66fdf4c11d Mon Sep 17 00:00:00 2001
> From: Tor Arntsen <tor_at_spacetec.no>
> Date: Tue, 13 Apr 2010 16:21:50 +0200
> Subject: [PATCH] Use correct directory for c-ares git pull
>
> Signed-off-by: Tor Arntsen <tor_at_spacetec.no>
> ---
> tests/testcurl.pl | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/testcurl.pl b/tests/testcurl.pl
> index 8877ac5..d44c3b1 100755
> --- a/tests/testcurl.pl
> +++ b/tests/testcurl.pl
> @@ -394,8 +394,8 @@ if ($git) {
> chomp ($_);
> logit " $_";
> }
> - if (-d "$CURLDIR/ares/.git") {
> - chdir "$CURLDIR/ares";
> + if (-d "ares/.git") {
> + chdir "ares";
> logit "run git pull in ares";
> system("git pull 2>&1");
> $gitstat += $?;
> @@ -407,7 +407,7 @@ if ($git) {
> chomp ($_);
> logit " $_";
> }
> - chdir $CURLDIR;
> + chdir "$pwd/$CURLDIR";
> }
> # Set timestamp to the UTC the git update took place.
> $timestamp = scalar(gmtime)." UTC" if (!$gitstat);

thanks, applied!
I think now its time for lession 5 of the book 'GIT for idiot
apprentice' where one explains to me how to correctly proceed with such
a patch? I did try with 'git apply', and while the patch was correctly
applied - the log and submitter data was not; instead with the following
'git commit -a' I was asked for the log entry, and your user data doesnt
appear ...
I admit that I probably made the failure to omit the first line 'From
<hash> date' because I found this a strange - especially the date 'Mon
Sep 17 00:00:00 2001' ...

GŁn.

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2010-04-13