[oe-commits] Paul Eggleton : scripts/combo-layer: limit component repo dirty check

git at git.openembedded.org git at git.openembedded.org
Fri Mar 23 12:17:00 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: b03e710c88ad0c66cf731647f26e8441d0074cae
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b03e710c88ad0c66cf731647f26e8441d0074cae

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Thu Mar 22 17:15:04 2012 +0000

scripts/combo-layer: limit component repo dirty check

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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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']





More information about the Openembedded-commits mailing list