'Re: [OE-core] [PATCH] lib/package_manager: Fix missing imports'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    Re: [OE-core] [PATCH] lib/package_manager: Fix missing imports
From:       "Tim Orling" <ticotimo () gmail ! com>
Date:       2020-07-31 1:23:39
Message-ID: CANx9H-C1tTBovgZW0JaOD2z_4jsxdrz28PiedDEuHsonesHJGQ () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


On Thu, Jul 30, 2020 at 3:02 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> The package_manager code rearranging had some issues with module imports
> that
> were now missing. Fix all the ones I could spot from quick inspection.
>

Thank you. I started working on this but you beat me to it.


> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/lib/oe/package_manager/deb/__init__.py | 2 ++
>  meta/lib/oe/package_manager/deb/rootfs.py   | 3 ++-
>  meta/lib/oe/package_manager/deb/sdk.py      | 3 ++-
>  meta/lib/oe/package_manager/ipk/__init__.py | 3 +++
>  meta/lib/oe/package_manager/ipk/rootfs.py   | 1 +
>  meta/lib/oe/package_manager/ipk/sdk.py      | 4 ++--
>  meta/lib/oe/package_manager/rpm/__init__.py | 2 ++
>  meta/lib/oe/package_manager/rpm/sdk.py      | 2 +-
>  meta/lib/oe/sdk.py                          | 2 --
>  9 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/meta/lib/oe/package_manager/deb/__init__.py
> b/meta/lib/oe/package_manager/deb/__init__.py
> index 3c214e59dd2..72155b178c9 100644
> --- a/meta/lib/oe/package_manager/deb/__init__.py
> +++ b/meta/lib/oe/package_manager/deb/__init__.py
> @@ -2,6 +2,8 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import re
> +import subprocess
>  from oe.package_manager import *
>
>  class DpkgIndexer(Indexer):
> diff --git a/meta/lib/oe/package_manager/deb/rootfs.py
> b/meta/lib/oe/package_manager/deb/rootfs.py
> index ac229f63d7a..819f67eda5c 100644
> --- a/meta/lib/oe/package_manager/deb/rootfs.py
> +++ b/meta/lib/oe/package_manager/deb/rootfs.py
> @@ -2,11 +2,12 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import re
> +import shutil
>  from oe.rootfs import Rootfs
>  from oe.manifest import Manifest
>  from oe.utils import execute_pre_post_process
>  from oe.package_manager.deb.manifest import DpkgManifest
> -import re
>  from oe.package_manager.deb import DpkgPM
>
>  class DpkgOpkgRootfs(Rootfs):
> diff --git a/meta/lib/oe/package_manager/deb/sdk.py
> b/meta/lib/oe/package_manager/deb/sdk.py
> index 3876f9b6833..b25eb70b00d 100644
> --- a/meta/lib/oe/package_manager/deb/sdk.py
> +++ b/meta/lib/oe/package_manager/deb/sdk.py
> @@ -2,11 +2,12 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import glob
> +import shutil
>  from oe.utils import execute_pre_post_process
>  from oe.sdk import Sdk
>  from oe.manifest import Manifest
>  from oe.package_manager.deb import DpkgPM
> -import shutil
>
>  class DpkgSdk(Sdk):
>      def __init__(self, d, manifest_dir=None):
> diff --git a/meta/lib/oe/package_manager/ipk/__init__.py
> b/meta/lib/oe/package_manager/ipk/__init__.py
> index 34500b8a0a9..9603993a591 100644
> --- a/meta/lib/oe/package_manager/ipk/__init__.py
> +++ b/meta/lib/oe/package_manager/ipk/__init__.py
> @@ -2,6 +2,9 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import re
> +import shutil
> +import subprocess
>  from oe.package_manager import *
>
>  class OpkgIndexer(Indexer):
> diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
> b/meta/lib/oe/package_manager/ipk/rootfs.py
> index 34dbcc27e64..63b4a59c401 100644
> --- a/meta/lib/oe/package_manager/ipk/rootfs.py
> +++ b/meta/lib/oe/package_manager/ipk/rootfs.py
> @@ -4,6 +4,7 @@
>
>  import re
>  import filecmp
> +import shutil
>  from oe.rootfs import Rootfs
>  from oe.manifest import Manifest
>  from oe.utils import execute_pre_post_process
> diff --git a/meta/lib/oe/package_manager/ipk/sdk.py
> b/meta/lib/oe/package_manager/ipk/sdk.py
> index e6d7b04bb88..47c0a92c1b6 100644
> --- a/meta/lib/oe/package_manager/ipk/sdk.py
> +++ b/meta/lib/oe/package_manager/ipk/sdk.py
> @@ -2,12 +2,12 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import glob
> +import shutil
>  from oe.utils import execute_pre_post_process
>  from oe.sdk import Sdk
>  from oe.manifest import Manifest
>  from oe.package_manager.ipk import OpkgPM
> -import shutil
> -import glob
>
>  class OpkgSdk(Sdk):
>      def __init__(self, d, manifest_dir=None):
> diff --git a/meta/lib/oe/package_manager/rpm/__init__.py
> b/meta/lib/oe/package_manager/rpm/__init__.py
> index 6183f81d586..c91f61ae5c1 100644
> --- a/meta/lib/oe/package_manager/rpm/__init__.py
> +++ b/meta/lib/oe/package_manager/rpm/__init__.py
> @@ -2,6 +2,8 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import shutil
> +import subprocess
>  from oe.package_manager import *
>
>  class RpmIndexer(Indexer):
> diff --git a/meta/lib/oe/package_manager/rpm/sdk.py
> b/meta/lib/oe/package_manager/rpm/sdk.py
> index 4d3f9461ef9..b14b155a85e 100644
> --- a/meta/lib/oe/package_manager/rpm/sdk.py
> +++ b/meta/lib/oe/package_manager/rpm/sdk.py
> @@ -2,11 +2,11 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  #
>
> +import glob
>  from oe.utils import execute_pre_post_process
>  from oe.sdk import Sdk
>  from oe.manifest import Manifest
>  from oe.package_manager.rpm import RpmPM
> -import glob
>
>  class RpmSdk(Sdk):
>      def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"):
> diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
> index 49f519891fb..fdcadcb8dee 100644
> --- a/meta/lib/oe/sdk.py
> +++ b/meta/lib/oe/sdk.py
> @@ -7,8 +7,6 @@ from oe.utils import execute_pre_post_process
>  from oe.manifest import *
>  from oe.package_manager import *
>  import os
> -import shutil
> -import glob
>  import traceback
>
>  class Sdk(object, metaclass=ABCMeta):
> --
> 2.25.1
>
> 
>

[Attachment #5 (text/html)]

<div><div dir="auto"><br></div></div><div><br><div class="gmail_quote"><div dir="ltr" \
class="gmail_attr">On Thu, Jul 30, 2020 at 3:02 PM Richard Purdie &lt;<a \
href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>&gt; \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex">The package_manager code \
rearranging had some issues with module imports that<br> were now missing. Fix all \
the ones I could spot from quick inspection.<br> </blockquote><div \
dir="auto"><br></div><div dir="auto">Thank you. I started working on this but you \
beat me to it.<br></div><div dir="auto"><br></div><blockquote class="gmail_quote" \
                style="margin:0 0 0 .8ex;border-left:1px #ccc \
                solid;padding-left:1ex"><br>
Signed-off-by: Richard Purdie &lt;<a href="mailto:richard.purdie@linuxfoundation.org" \
                target="_blank">richard.purdie@linuxfoundation.org</a>&gt;<br>
---<br>
  meta/lib/oe/package_manager/deb/__init__.py | 2 ++<br>
  meta/lib/oe/package_manager/deb/rootfs.py     | 3 ++-<br>
  meta/lib/oe/package_manager/deb/sdk.py         | 3 ++-<br>
  meta/lib/oe/package_manager/ipk/__init__.py | 3 +++<br>
  meta/lib/oe/package_manager/ipk/rootfs.py     | 1 +<br>
  meta/lib/oe/package_manager/ipk/sdk.py         | 4 ++--<br>
  meta/lib/oe/package_manager/rpm/__init__.py | 2 ++<br>
  meta/lib/oe/package_manager/rpm/sdk.py         | 2 +-<br>
  meta/lib/oe/sdk.py                                       | 2 --<br>
  9 files changed, 15 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/meta/lib/oe/package_manager/deb/__init__.py \
b/meta/lib/oe/package_manager/deb/__init__.py<br> index 3c214e59dd2..72155b178c9 \
                100644<br>
--- a/meta/lib/oe/package_manager/deb/__init__.py<br>
+++ b/meta/lib/oe/package_manager/deb/__init__.py<br>
@@ -2,6 +2,8 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import re<br>
+import subprocess<br>
  from oe.package_manager import *<br>
<br>
  class DpkgIndexer(Indexer):<br>
diff --git a/meta/lib/oe/package_manager/deb/rootfs.py \
b/meta/lib/oe/package_manager/deb/rootfs.py<br> index ac229f63d7a..819f67eda5c \
                100644<br>
--- a/meta/lib/oe/package_manager/deb/rootfs.py<br>
+++ b/meta/lib/oe/package_manager/deb/rootfs.py<br>
@@ -2,11 +2,12 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import re<br>
+import shutil<br>
  from oe.rootfs import Rootfs<br>
  from oe.manifest import Manifest<br>
  from oe.utils import execute_pre_post_process<br>
  from oe.package_manager.deb.manifest import DpkgManifest<br>
-import re<br>
  from oe.package_manager.deb import DpkgPM<br>
<br>
  class DpkgOpkgRootfs(Rootfs):<br>
diff --git a/meta/lib/oe/package_manager/deb/sdk.py \
b/meta/lib/oe/package_manager/deb/sdk.py<br> index 3876f9b6833..b25eb70b00d \
                100644<br>
--- a/meta/lib/oe/package_manager/deb/sdk.py<br>
+++ b/meta/lib/oe/package_manager/deb/sdk.py<br>
@@ -2,11 +2,12 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import glob<br>
+import shutil<br>
  from oe.utils import execute_pre_post_process<br>
  from oe.sdk import Sdk<br>
  from oe.manifest import Manifest<br>
  from oe.package_manager.deb import DpkgPM<br>
-import shutil<br>
<br>
  class DpkgSdk(Sdk):<br>
        def __init__(self, d, manifest_dir=None):<br>
diff --git a/meta/lib/oe/package_manager/ipk/__init__.py \
b/meta/lib/oe/package_manager/ipk/__init__.py<br> index 34500b8a0a9..9603993a591 \
                100644<br>
--- a/meta/lib/oe/package_manager/ipk/__init__.py<br>
+++ b/meta/lib/oe/package_manager/ipk/__init__.py<br>
@@ -2,6 +2,9 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import re<br>
+import shutil<br>
+import subprocess<br>
  from oe.package_manager import *<br>
<br>
  class OpkgIndexer(Indexer):<br>
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py \
b/meta/lib/oe/package_manager/ipk/rootfs.py<br> index 34dbcc27e64..63b4a59c401 \
                100644<br>
--- a/meta/lib/oe/package_manager/ipk/rootfs.py<br>
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py<br>
@@ -4,6 +4,7 @@<br>
<br>
  import re<br>
  import filecmp<br>
+import shutil<br>
  from oe.rootfs import Rootfs<br>
  from oe.manifest import Manifest<br>
  from oe.utils import execute_pre_post_process<br>
diff --git a/meta/lib/oe/package_manager/ipk/sdk.py \
b/meta/lib/oe/package_manager/ipk/sdk.py<br> index e6d7b04bb88..47c0a92c1b6 \
                100644<br>
--- a/meta/lib/oe/package_manager/ipk/sdk.py<br>
+++ b/meta/lib/oe/package_manager/ipk/sdk.py<br>
@@ -2,12 +2,12 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import glob<br>
+import shutil<br>
  from oe.utils import execute_pre_post_process<br>
  from oe.sdk import Sdk<br>
  from oe.manifest import Manifest<br>
  from oe.package_manager.ipk import OpkgPM<br>
-import shutil<br>
-import glob<br>
<br>
  class OpkgSdk(Sdk):<br>
        def __init__(self, d, manifest_dir=None):<br>
diff --git a/meta/lib/oe/package_manager/rpm/__init__.py \
b/meta/lib/oe/package_manager/rpm/__init__.py<br> index 6183f81d586..c91f61ae5c1 \
                100644<br>
--- a/meta/lib/oe/package_manager/rpm/__init__.py<br>
+++ b/meta/lib/oe/package_manager/rpm/__init__.py<br>
@@ -2,6 +2,8 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import shutil<br>
+import subprocess<br>
  from oe.package_manager import *<br>
<br>
  class RpmIndexer(Indexer):<br>
diff --git a/meta/lib/oe/package_manager/rpm/sdk.py \
b/meta/lib/oe/package_manager/rpm/sdk.py<br> index 4d3f9461ef9..b14b155a85e \
                100644<br>
--- a/meta/lib/oe/package_manager/rpm/sdk.py<br>
+++ b/meta/lib/oe/package_manager/rpm/sdk.py<br>
@@ -2,11 +2,11 @@<br>
  # SPDX-License-Identifier: GPL-2.0-only<br>
  #<br>
<br>
+import glob<br>
  from oe.utils import execute_pre_post_process<br>
  from oe.sdk import Sdk<br>
  from oe.manifest import Manifest<br>
  from oe.package_manager.rpm import RpmPM<br>
-import glob<br>
<br>
  class RpmSdk(Sdk):<br>
        def __init__(self, d, manifest_dir=None, \
                rpm_workdir=&quot;oe-sdk-repo&quot;):<br>
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py<br>
index 49f519891fb..fdcadcb8dee 100644<br>
--- a/meta/lib/oe/sdk.py<br>
+++ b/meta/lib/oe/sdk.py<br>
@@ -7,8 +7,6 @@ from oe.utils import execute_pre_post_process<br>
  from oe.manifest import *<br>
  from oe.package_manager import *<br>
  import os<br>
-import shutil<br>
-import glob<br>
  import traceback<br>
<br>
  class Sdk(object, metaclass=ABCMeta):<br>
-- <br>
2.25.1<br>
<br>
<br>
</blockquote></div></div>



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#141126): https://lists.openembedded.org/g/openembedded-core/message/141126
Mute This Topic: https://lists.openembedded.org/mt/75896352/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic