[ketchup] Fix for the install_nearest function

[Michael Opdenacker]

For people managing kernel sources with the excellent 'ketchup' tool 
(http://www.selenic.com/ketchup/wiki/index.cgi/FrontPage)

A full version containing my 2 fixes is available on 
http://free-electrons.com/pub/patches/ketchup/ketchup-0.9.6-latest-fixes

Patch for ketchup 0.9.6
=======================

> From Michael Opdenacker <michael@xxxxxxxxxxxxxxxxxx>

Issue
-----

> ketchup 2.6-git
None -> 2.6.15-git9
Downloading linux-2.6.15.tar.bz2
--18:17:52--  http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2
          => `/home/mike/.ketchup/linux-2.6.15.tar.bz2.partial'
Resolving www.kernel.org... 204.152.191.5, 204.152.191.37
Connecting to www.kernel.org|204.152.191.5|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 39,832,836 (38M) [application/x-bzip2]

100%[==============================================================================================================================>]
39,832,836    24.11K/s    ETA 00:00

18:24:44 (94.56 KB/s) - `/home/mike/.ketchup/linux-2.6.15.tar.bz2.partial'
saved [39832836/39832836]

DEBUG: f, sign /home/mike/.ketchup/linux-2.6.15.tar.bz2 1
Traceback (most recent call last):
 File "/data/soft/bin/ketchup", line 738, in ?
   transform(a, b)
 File "/data/soft/bin/ketchup", line 507, in transform
   a = install_nearest(base(b))
 File "/data/soft/bin/ketchup", line 475, in install_nearest
   f = trydownload([url], f, 1)
 File "/data/soft/bin/ketchup", line 357, in trydownload
   if not sign or verify(url, f, sign):
 File "/data/soft/bin/ketchup", line 336, in verify
   sf = f + sign
TypeError: cannot concatenate 'str' and 'int' objects

Explanation
-----------

As shown above, 'try_download' is called with its 'sign'
argument set to '1'.

However, 'sign' is supposed to be the extension
of the signature file. The '1' value means the
default extension (".sign") in the 'version_info'
definition, but can't be passed as such
to 'try_download'.

Proposed fix
------------

http://free-electrons.com/pub/patches/ketchup/20060113a/ketchup-sign-fix.patch

Caution: just tested with 2.6-git. I may have missed something important.

--
Michael Opdenacker, Free Electrons
Free Embedded Linux Training Materials
on http://free-electrons.com/training

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/