[PATCH] dpkg-base: Do not fail clean if there are no packages

[PATCH] dpkg-base: Do not fail clean if there are no packages

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 3e6ba8c..2e439d6 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -101,7 +101,7 @@ do_build() {
 CLEANFUNCS += "repo_clean"
 
 repo_clean() {
-    DEBS=$( ls ${S}/../*.deb )
+    DEBS=$( ls ${S}/../*.deb || true )
     if [ -n "${DEBS}" ]; then
         for d in ${DEBS}; do
             p=$( dpkg-deb --show --showformat '${Package}' ${d} )
-- 
2.16.4

Re: [PATCH] dpkg-base: Do not fail clean if there are no packages

[Henning Schild]

Am Fri, 5 Jul 2019 20:04:39 +0200
schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/dpkg-base.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass
> b/meta/classes/dpkg-base.bbclass index 3e6ba8c..2e439d6 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -101,7 +101,7 @@ do_build() {
>  CLEANFUNCS += "repo_clean"
>  
>  repo_clean() {
> -    DEBS=$( ls ${S}/../*.deb )
> +    DEBS=$( ls ${S}/../*.deb || true )

That is not a good idea because is ignores too many errors. I would
suggest using find instead.

Henning

>      if [ -n "${DEBS}" ]; then
>          for d in ${DEBS}; do
>              p=$( dpkg-deb --show --showformat '${Package}' ${d} )

[PATCH v2] dpkg-base: Do not fail clean if there are no packages

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Use find instead of ls so that non-existing deb packages do not make
this fail, just leaving DEBS empty.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Changes in v2:
 - use find instead of ls || true

 meta/classes/dpkg-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 3e6ba8c..826b5d8 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -101,7 +101,7 @@ do_build() {
 CLEANFUNCS += "repo_clean"
 
 repo_clean() {
-    DEBS=$( ls ${S}/../*.deb )
+    DEBS=$( find ${S}/.. -maxdepth 1 -name "*.deb" )
     if [ -n "${DEBS}" ]; then
         for d in ${DEBS}; do
             p=$( dpkg-deb --show --showformat '${Package}' ${d} )
-- 
2.16.4

Re: [PATCH v2] dpkg-base: Do not fail clean if there are no packages

[Baurzhan Ismagulov]

On Tue, Jul 09, 2019 at 02:04:53PM +0200, Jan Kiszka wrote:
> Use find instead of ls so that non-existing deb packages do not make
> this fail, just leaving DEBS empty.

Thanks, applied to next.

With kind regards,
Baurzhan.