Patchwork [1/2] scripts/combo-layer: limit component repo dirty check

login
register
mail settings
Submitter Paul Eggleton
Date March 22, 2012, 5:15 p.m.
Message ID <587666661eacb8bad434b7f634dcd3213a7c5b96.1332436375.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/24173/
State Accepted
Commit b03e710c88ad0c66cf731647f26e8441d0074cae
Headers show

Comments

Paul Eggleton - March 22, 2012, 5:15 p.m.
If one or more components are specified for update, only check if their
repository/repositories are dirty rather than checking all of the
configured repositories.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 scripts/combo-layer |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
Otavio Salvador - March 22, 2012, 7:44 p.m.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Thu, Mar 22, 2012 at 14:15, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> If one or more components are specified for update, only check if their
> repository/repositories are dirty rather than checking all of the
> configured repositories.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  scripts/combo-layer |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/scripts/combo-layer b/scripts/combo-layer
> index 7457ba2..3612323 100755
> --- a/scripts/combo-layer
> +++ b/scripts/combo-layer
> @@ -150,15 +150,6 @@ def action_update(conf, args):
>         generate the patch list
>         apply the generated patches
>     """
> -    # make sure all repos are clean
> -    for name in conf.repos:
> -        check_repo_clean(conf.repos[name]['local_repo_dir'])
> -    check_repo_clean(os.getcwd())
> -
> -    import uuid
> -    patch_dir = "patch-%s" % uuid.uuid4()
> -    os.mkdir(patch_dir)
> -
>     repos = []
>     if len(args) > 1:
>         for arg in args[1:]:
> @@ -174,6 +165,15 @@ def action_update(conf, args):
>     if not repos:
>         repos = conf.repos
>
> +    # make sure all repos are clean
> +    for name in repos:
> +        check_repo_clean(conf.repos[name]['local_repo_dir'])
> +    check_repo_clean(os.getcwd())
> +
> +    import uuid
> +    patch_dir = "patch-%s" % uuid.uuid4()
> +    os.mkdir(patch_dir)
> +
>     for name in repos:
>         repo = conf.repos[name]
>         ldir = repo['local_repo_dir']
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 7457ba2..3612323 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -150,15 +150,6 @@  def action_update(conf, args):
         generate the patch list
         apply the generated patches
     """
-    # make sure all repos are clean
-    for name in conf.repos:
-        check_repo_clean(conf.repos[name]['local_repo_dir'])
-    check_repo_clean(os.getcwd())
-
-    import uuid
-    patch_dir = "patch-%s" % uuid.uuid4()
-    os.mkdir(patch_dir)
-
     repos = []
     if len(args) > 1:
         for arg in args[1:]:
@@ -174,6 +165,15 @@  def action_update(conf, args):
     if not repos:
         repos = conf.repos
 
+    # make sure all repos are clean
+    for name in repos:
+        check_repo_clean(conf.repos[name]['local_repo_dir'])
+    check_repo_clean(os.getcwd())
+
+    import uuid
+    patch_dir = "patch-%s" % uuid.uuid4()
+    os.mkdir(patch_dir)
+
     for name in repos:
         repo = conf.repos[name]
         ldir = repo['local_repo_dir']