* [PATCH] fetch2: Drop globbing supprt in file:// SRC_URIs
@ 2020-08-25 13:56 Richard Purdie
2020-08-25 15:07 ` [bitbake-devel] " Christopher Larson
0 siblings, 1 reply; 2+ messages in thread
From: Richard Purdie @ 2020-08-25 13:56 UTC (permalink / raw)
To: bitbake-devel
Globbing in file:// urls is terminally broken. Currently when its used, the
file checksum code is basically bypassed. This means changes to the source
files don't change the task checksum, the task doesn't rebuild when the
inputs change and things generally break.
To make globbing work generically, we'd have to scan the file system for
all possible matches to the glob and log whether they exist or not. We can't
simply log the files which exist, we have to also know which files could
later exist and influence the choice of file so we know when to reparse.
For a simple file://xxx/*, this could be done but for bigger patterns,
it becomes much more problemtic. We already support file://xxx/ in urls.
So, lets decide we'll not support globs in file://urls. Worse case users
can put files in a directory and reference that, moving files into place
if needed.
Remove all the glob special cases (see the comments if anyone doesn't
believe this is terminally broken) and error to the user if they have
such urls.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
lib/bb/cache.py | 2 +-
lib/bb/fetch2/__init__.py | 12 ------------
lib/bb/fetch2/local.py | 15 +++------------
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index b819a0c2da..9e0c931a07 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -636,7 +636,7 @@ class Cache(NoCache):
# Have to be careful about spaces and colons in filenames
flist = self.filelist_regex.split(fl)
for f in flist:
- if not f or "*" in f:
+ if not f:
continue
f, exist = f.split(":")
if (exist == "True" and not os.path.exists(f)) or (exist == "False" and os.path.exists(f)):
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 756f60212f..7ec1fea5d0 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1195,8 +1195,6 @@ def get_checksum_file_list(d):
paths = ud.method.localpaths(ud, d)
for f in paths:
pth = ud.decodedurl
- if '*' in pth:
- f = os.path.join(os.path.abspath(f), pth)
if f.startswith(dl_dir):
# The local fetcher's behaviour is to return a path under DL_DIR if it couldn't find the file anywhere else
if os.path.exists(f):
@@ -1365,9 +1363,6 @@ class FetchMethod(object):
# We cannot compute checksums for directories
if os.path.isdir(urldata.localpath):
return False
- if urldata.localpath.find("*") != -1:
- return False
-
return True
def recommends_checksum(self, urldata):
@@ -1430,11 +1425,6 @@ class FetchMethod(object):
iterate = False
file = urldata.localpath
- # Localpath can't deal with 'dir/*' entries, so it converts them to '.',
- # but it must be corrected back for local files copying
- if urldata.basename == '*' and file.endswith('/.'):
- file = '%s/%s' % (file.rstrip('/.'), urldata.path)
-
try:
unpack = bb.utils.to_boolean(urldata.parm.get('unpack'), True)
except ValueError as exc:
@@ -1613,8 +1603,6 @@ class FetchMethod(object):
"""
if os.path.exists(ud.localpath):
return True
- if ud.localpath.find("*") != -1:
- return True
return False
def implicit_urldata(self, ud, d):
diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py
index 01d9ff9f8f..25d4557db6 100644
--- a/lib/bb/fetch2/local.py
+++ b/lib/bb/fetch2/local.py
@@ -17,7 +17,7 @@ import os
import urllib.request, urllib.parse, urllib.error
import bb
import bb.utils
-from bb.fetch2 import FetchMethod, FetchError
+from bb.fetch2 import FetchMethod, FetchError, ParameterError
from bb.fetch2 import logger
class Local(FetchMethod):
@@ -33,6 +33,8 @@ class Local(FetchMethod):
ud.basename = os.path.basename(ud.decodedurl)
ud.basepath = ud.decodedurl
ud.needdonestamp = False
+ if "*" in ud.decodedurl:
+ raise bb.fetch2.ParameterError("file:// urls using globbing are no longer supported. Please place the files in a directory and reference that instead.", ud.url)
return
def localpath(self, urldata, d):
@@ -55,12 +57,6 @@ class Local(FetchMethod):
logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
newpath, hist = bb.utils.which(filespath, path, history=True)
searched.extend(hist)
- if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1:
- # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
- newpath, hist = bb.utils.which(filespath, ".", history=True)
- searched.extend(hist)
- logger.debug(2, "Searching for %s in path: %s" % (path, newpath))
- return searched
if not os.path.exists(newpath):
dldirfile = os.path.join(d.getVar("DL_DIR"), path)
logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path))
@@ -70,8 +66,6 @@ class Local(FetchMethod):
return searched
def need_update(self, ud, d):
- if ud.url.find("*") != -1:
- return False
if os.path.exists(ud.localpath):
return False
return True
@@ -95,9 +89,6 @@ class Local(FetchMethod):
"""
Check the status of the url
"""
- if urldata.localpath.find("*") != -1:
- logger.info("URL %s looks like a glob and was therefore not checked.", urldata.url)
- return True
if os.path.exists(urldata.localpath):
return True
return False
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [bitbake-devel] [PATCH] fetch2: Drop globbing supprt in file:// SRC_URIs
2020-08-25 13:56 [PATCH] fetch2: Drop globbing supprt in file:// SRC_URIs Richard Purdie
@ 2020-08-25 15:07 ` Christopher Larson
0 siblings, 0 replies; 2+ messages in thread
From: Christopher Larson @ 2020-08-25 15:07 UTC (permalink / raw)
To: Richard Purdie; +Cc: bitbake-devel
[-- Attachment #1: Type: text/plain, Size: 6689 bytes --]
Good riddance! Thanks for this.
On Tue, Aug 25, 2020 at 6:56 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> Globbing in file:// urls is terminally broken. Currently when its used, the
> file checksum code is basically bypassed. This means changes to the source
> files don't change the task checksum, the task doesn't rebuild when the
> inputs change and things generally break.
>
> To make globbing work generically, we'd have to scan the file system for
> all possible matches to the glob and log whether they exist or not. We
> can't
> simply log the files which exist, we have to also know which files could
> later exist and influence the choice of file so we know when to reparse.
>
> For a simple file://xxx/*, this could be done but for bigger patterns,
> it becomes much more problemtic. We already support file://xxx/ in urls.
>
> So, lets decide we'll not support globs in file://urls. Worse case users
> can put files in a directory and reference that, moving files into place
> if needed.
>
> Remove all the glob special cases (see the comments if anyone doesn't
> believe this is terminally broken) and error to the user if they have
> such urls.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> lib/bb/cache.py | 2 +-
> lib/bb/fetch2/__init__.py | 12 ------------
> lib/bb/fetch2/local.py | 15 +++------------
> 3 files changed, 4 insertions(+), 25 deletions(-)
>
> diff --git a/lib/bb/cache.py b/lib/bb/cache.py
> index b819a0c2da..9e0c931a07 100644
> --- a/lib/bb/cache.py
> +++ b/lib/bb/cache.py
> @@ -636,7 +636,7 @@ class Cache(NoCache):
> # Have to be careful about spaces and colons in filenames
> flist = self.filelist_regex.split(fl)
> for f in flist:
> - if not f or "*" in f:
> + if not f:
> continue
> f, exist = f.split(":")
> if (exist == "True" and not os.path.exists(f)) or
> (exist == "False" and os.path.exists(f)):
> diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
> index 756f60212f..7ec1fea5d0 100644
> --- a/lib/bb/fetch2/__init__.py
> +++ b/lib/bb/fetch2/__init__.py
> @@ -1195,8 +1195,6 @@ def get_checksum_file_list(d):
> paths = ud.method.localpaths(ud, d)
> for f in paths:
> pth = ud.decodedurl
> - if '*' in pth:
> - f = os.path.join(os.path.abspath(f), pth)
> if f.startswith(dl_dir):
> # The local fetcher's behaviour is to return a path
> under DL_DIR if it couldn't find the file anywhere else
> if os.path.exists(f):
> @@ -1365,9 +1363,6 @@ class FetchMethod(object):
> # We cannot compute checksums for directories
> if os.path.isdir(urldata.localpath):
> return False
> - if urldata.localpath.find("*") != -1:
> - return False
> -
> return True
>
> def recommends_checksum(self, urldata):
> @@ -1430,11 +1425,6 @@ class FetchMethod(object):
> iterate = False
> file = urldata.localpath
>
> - # Localpath can't deal with 'dir/*' entries, so it converts them
> to '.',
> - # but it must be corrected back for local files copying
> - if urldata.basename == '*' and file.endswith('/.'):
> - file = '%s/%s' % (file.rstrip('/.'), urldata.path)
> -
> try:
> unpack = bb.utils.to_boolean(urldata.parm.get('unpack'), True)
> except ValueError as exc:
> @@ -1613,8 +1603,6 @@ class FetchMethod(object):
> """
> if os.path.exists(ud.localpath):
> return True
> - if ud.localpath.find("*") != -1:
> - return True
> return False
>
> def implicit_urldata(self, ud, d):
> diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py
> index 01d9ff9f8f..25d4557db6 100644
> --- a/lib/bb/fetch2/local.py
> +++ b/lib/bb/fetch2/local.py
> @@ -17,7 +17,7 @@ import os
> import urllib.request, urllib.parse, urllib.error
> import bb
> import bb.utils
> -from bb.fetch2 import FetchMethod, FetchError
> +from bb.fetch2 import FetchMethod, FetchError, ParameterError
> from bb.fetch2 import logger
>
> class Local(FetchMethod):
> @@ -33,6 +33,8 @@ class Local(FetchMethod):
> ud.basename = os.path.basename(ud.decodedurl)
> ud.basepath = ud.decodedurl
> ud.needdonestamp = False
> + if "*" in ud.decodedurl:
> + raise bb.fetch2.ParameterError("file:// urls using globbing
> are no longer supported. Please place the files in a directory and
> reference that instead.", ud.url)
> return
>
> def localpath(self, urldata, d):
> @@ -55,12 +57,6 @@ class Local(FetchMethod):
> logger.debug(2, "Searching for %s in paths:\n %s" % (path,
> "\n ".join(filespath.split(":"))))
> newpath, hist = bb.utils.which(filespath, path, history=True)
> searched.extend(hist)
> - if (not newpath or not os.path.exists(newpath)) and
> path.find("*") != -1:
> - # For expressions using '*', best we can do is take the first
> directory in FILESPATH that exists
> - newpath, hist = bb.utils.which(filespath, ".", history=True)
> - searched.extend(hist)
> - logger.debug(2, "Searching for %s in path: %s" % (path,
> newpath))
> - return searched
> if not os.path.exists(newpath):
> dldirfile = os.path.join(d.getVar("DL_DIR"), path)
> logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path))
> @@ -70,8 +66,6 @@ class Local(FetchMethod):
> return searched
>
> def need_update(self, ud, d):
> - if ud.url.find("*") != -1:
> - return False
> if os.path.exists(ud.localpath):
> return False
> return True
> @@ -95,9 +89,6 @@ class Local(FetchMethod):
> """
> Check the status of the url
> """
> - if urldata.localpath.find("*") != -1:
> - logger.info("URL %s looks like a glob and was therefore not
> checked.", urldata.url)
> - return True
> if os.path.exists(urldata.localpath):
> return True
> return False
> --
> 2.25.1
>
>
>
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 8388 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-25 15:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 13:56 [PATCH] fetch2: Drop globbing supprt in file:// SRC_URIs Richard Purdie
2020-08-25 15:07 ` [bitbake-devel] " Christopher Larson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.