diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2013-09-17 02:35:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 19:34:56 +0100 |
commit | 37cb3e3aa4dc6fa63e5c6538dac6301d363f433c (patch) | |
tree | 262fd59d51c70438d743142350238d13180dd356 | |
parent | 9a4169a46555cd1b6a648522ce2b782ac1874343 (diff) | |
download | poky-37cb3e3aa4dc6fa63e5c6538dac6301d363f433c.tar.gz |
python-smartpm: truncate the filename to meet NAME_MAX
There is a "File name too long" error when len(TMPDIR) = 410, this is
because the function getLocalPath() converts the filepath into the
filename, so there would be the error when len(filename)
> NAME_MAX, truncate the filename to meet NAME_MAX will fix the problem.
[YOCTO #5201]
(From OE-Core rev: 9f0427edee6bf62d3fe7cdceb07f59a5776c8c4f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch | 35 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch b/meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch new file mode 100644 index 0000000000..22794a7388 --- /dev/null +++ b/meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From a17998b6be3319ae476a64f366737bc267a53a8a Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 16 Sep 2013 05:54:13 -0400 | ||
4 | Subject: [PATCH] fetcher.py: truncate the filename to meet NAME_MAX | ||
5 | |||
6 | The function getLocalPath() converts the filepath into the filename, | ||
7 | there would be a "File name too long" error when len(filename) > | ||
8 | NAME_MAX, truncate it to meet NAME_MAX will fix the problem. | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | --- | ||
12 | smart/fetcher.py | 8 ++++++++ | ||
13 | 1 file changed, 8 insertions(+) | ||
14 | |||
15 | diff --git a/smart/fetcher.py b/smart/fetcher.py | ||
16 | --- a/smart/fetcher.py | ||
17 | +++ b/smart/fetcher.py | ||
18 | @@ -139,6 +139,14 @@ class Fetcher(object): | ||
19 | filename = os.path.basename(path) | ||
20 | if self._localpathprefix: | ||
21 | filename = self._localpathprefix+filename | ||
22 | + # pathconf requires the path existed | ||
23 | + if not os.path.exists(self._localdir): | ||
24 | + os.makedirs(self._localdir) | ||
25 | + name_max = os.pathconf(self._localdir, 'PC_NAME_MAX') | ||
26 | + # The length of the filename should be less than NAME_MAX | ||
27 | + if len(filename) > name_max: | ||
28 | + iface.debug(_("Truncate %s to %s") % (filename, filename[-name_max:])) | ||
29 | + filename = filename[-name_max:] | ||
30 | return os.path.join(self._localdir, filename) | ||
31 | |||
32 | def setForceCopy(self, value): | ||
33 | -- | ||
34 | 1.7.10.4 | ||
35 | |||
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb index f406d692e3..f349469d22 100644 --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb | |||
@@ -31,6 +31,7 @@ SRC_URI = "\ | |||
31 | file://smart-flag-exclude-packages.patch \ | 31 | file://smart-flag-exclude-packages.patch \ |
32 | file://smart-config-ignore-all-recommends.patch \ | 32 | file://smart-config-ignore-all-recommends.patch \ |
33 | file://smart-attempt.patch \ | 33 | file://smart-attempt.patch \ |
34 | file://smart-filename-NAME_MAX.patch \ | ||
34 | " | 35 | " |
35 | 36 | ||
36 | SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" | 37 | SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" |