Permalink
Browse files

FL-359: add MergeUpdates to fix upstream slotmove

  • Loading branch information...
1 parent dc9f364 commit ba3b3a64f0aae579e3ea989e6a4bdefc249ad5ef @angryvincent angryvincent committed Feb 5, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 funtoo/scripts/merge.py
@@ -19,7 +19,8 @@
SyncTree(gentoo_src,exclude=["/metadata/cache/**","ChangeLog", "dev-util/metro"]),
ApplyPatchSeries("%s/funtoo/patches" % funtoo_overlay.root ),
ThirdPartyMirrors(),
- SyncDir(funtoo_overlay.root,"profiles","profiles", exclude=["repo_name","categories"]),
+ SyncDir(funtoo_overlay.root, "profiles", "profiles", exclude=["categories", "repo_name", "updates"]),
+ MergeUpdates(funtoo_overlay.root),
ProfileDepFix(),
SyncDir(funtoo_overlay.root,"licenses"),
SyncDir(funtoo_overlay.root,"eclass"),

0 comments on commit ba3b3a6

Please sign in to comment.