All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Tim Orling" <ticotimo@gmail.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] lib/package_manager: Fix missing imports
Date: Thu, 30 Jul 2020 18:23:39 -0700	[thread overview]
Message-ID: <CANx9H-C1tTBovgZW0JaOD2z_4jsxdrz28PiedDEuHsonesHJGQ@mail.gmail.com> (raw)
In-Reply-To: <20200730220212.442299-1-richard.purdie@linuxfoundation.org>

[-- Attachment #1: Type: text/plain, Size: 5602 bytes --]

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 #2: Type: text/html, Size: 6575 bytes --]

      reply	other threads:[~2020-07-31  1:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-30 22:02 [PATCH] lib/package_manager: Fix missing imports Richard Purdie
2020-07-31  1:23 ` Tim Orling [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CANx9H-C1tTBovgZW0JaOD2z_4jsxdrz28PiedDEuHsonesHJGQ@mail.gmail.com \
    --to=ticotimo@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.