diff mbox series

[2/5] deb-dl-dir: Fix quoting

Message ID 815ce8ec0fadec7ba3a5b8bf49e48c10e7370142.1600962590.git.jan.kiszka@siemens.com
State Superseded, archived
Headers show
Series More fixes and cleanups | expand

Commit Message

Jan Kiszka Sept. 24, 2020, 7:49 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

The outer flock call wraps this in '', so this can't be used inside the
block. The current code failed if some .deb file happened to lie around
in the build folder.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/deb-dl-dir.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Henning Schild Sept. 24, 2020, 1:27 p.m. UTC | #1 
Good catch!

On Thu, 24 Sep 2020 17:49:48 +0200
"[ext] Jan Kiszka" <jan.kiszka@siemens.com> wrote:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> The outer flock call wraps this in '', so this can't be used inside
> the block. The current code failed if some .deb file happened to lie
> around in the build folder.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/deb-dl-dir.bbclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/deb-dl-dir.bbclass
> b/meta/classes/deb-dl-dir.bbclass index e9967036..54c29947 100644
> --- a/meta/classes/deb-dl-dir.bbclass
> +++ b/meta/classes/deb-dl-dir.bbclass
> @@ -14,8 +14,8 @@ deb_dl_dir_import() {
>          set -e
>          printenv | grep -q BB_VERBOSE_LOGS && set -x
>  
> -        sudo find "${pc}" -type f -iname '*\.deb' -exec \
> -            cp -n --no-preserve=owner -t
> "${rootfs}"/var/cache/apt/archives/ '{}' +
> +        sudo find "${pc}" -type f -iname "*\.deb" -exec \
> +            cp -n --no-preserve=owner -t
> "${rootfs}"/var/cache/apt/archives/ {} + '
>  }
>
diff mbox series

Patch

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index e9967036..54c29947 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -14,8 +14,8 @@  deb_dl_dir_import() {
         set -e
         printenv | grep -q BB_VERBOSE_LOGS && set -x
 
-        sudo find "${pc}" -type f -iname '*\.deb' -exec \
-            cp -n --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ '{}' +
+        sudo find "${pc}" -type f -iname "*\.deb" -exec \
+            cp -n --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ {} +
     '
 }