The upgrade failed when new files were added to the recipe and
the compilation was made for multiple machines. Now this problem
has been fixed.

Signed-off-by: Marius Avram <marius.av...@intel.com>
---
 recipe.py |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/recipe.py b/recipe.py
index e6430cd..8ecd2a2 100644
--- a/recipe.py
+++ b/recipe.py
@@ -452,11 +452,15 @@ class Recipe(object):
           "/usr/lib/opie"   : "palmqtdir",
         }
 
+        I(" %s: Add new files in recipe ..." %  self.env['PN'])
         with open(package_log) as log:
             for line in log:
                 if re.match(".*Files/directories were installed but not 
shipped.*", line):
                     files_not_shipped = True
+                # Extract path
                 line = line.strip()
+                if line:
+                    line = line.split()[0]
                 if files_not_shipped and os.path.isabs(line):
                     # Count occurences for globbing
                     path_exists = False
@@ -587,6 +591,7 @@ class Recipe(object):
             self.git.delete_branch("remove_patches")
             self.git.reset_hard()
             self.git.reset_soft(1)
+            self.removed_patches = False
 
     def compile(self, machine):
         try:
@@ -597,6 +602,7 @@ class Recipe(object):
                 self.git.delete_branch("remove_patches")
                 self.git.reset_soft(1)
                 self.commit_msg += self.rm_patches_msg + "\n"
+                self.removed_patches = False
         except Error as e:
             if self._is_incompatible_host(e.stdout):
                 W(" %s: compilation failed: incompatible host" % 
self.env['PN'])
-- 
1.7.9.5

-- 
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Reply via email to