Advertisement
Guest User

Untitled

a guest
Oct 16th, 2017
103
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.03 KB | None | 0 0
  1. * Syncing selected overlays,...
  2. * Running Git... # ( cd /var/lib/layman/pentoo && /usr/bin/git pull )
  3. remote: Counting objects: 46, done.
  4. remote: Compressing objects: 100% (22/22), done.
  5. remote: Total 46 (delta 30), reused 39 (delta 23), pack-reused 0
  6. Unpacking objects: 100% (46/46), done.
  7. From git://github.com/pentoo/pentoo-overlay
  8. 4841d15..5b888ef master -> origin/master
  9. Updating db3ff4c..5b888ef
  10. error: Your local changes to the following files would be overwritten by merge:
  11. scripts/pentoo-updater.sh
  12. Please commit your changes or stash them before you merge.
  13. Aborting
  14. * Failure result returned from Git
  15. *
  16. * Errors:
  17. * ------
  18. * Failed to sync overlay "pentoo".
  19. * Error was: Syncing overlay "pentoo" returned status 1!
  20. * db.sync()
  21. *
  22.  
  23. * CLI: Errors occurred processing action sync_all
  24. *
  25. * Errors:
  26. * ------
  27. * Failed to sync overlay "pentoo".
  28. * Error was: Syncing overlay "pentoo" returned status 1!
  29. * db.sync()
  30. *
  31.  
  32. * Spawn failed for: layman-sync, /etc/portage/postsync.d/layman-sync
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement