View previous topic :: View next topic |
Author |
Message |
audiodef Watchman
Joined: 06 Jul 2005 Posts: 6639 Location: The soundosphere
|
Posted: Mon May 13, 2013 5:35 pm Post subject: How to auto-select mc when running layman? |
|
|
I have the following script:
Code: |
#!/bin/bash
#
# Expects no more than one update per day.
# If you do it twice, you'll overwrite today's existing logs.
# You should not update more than once a day, anyway.
#
emerge --sync
layman -S
eix-update
today=$(date +"%Y-%m-%d")
echo "Main updates: " > /home/gentoostudio/Portage/Updates/$today
emerge -pvuDN world >> /home/gentoostudio/Portage/Updates/$today
emerge -vuDN --keep-going world
echo "Live updates:" >> /home/gentoostudio/Portage/Updates/$today
smart-live-rebuild -p >> /home/gentoostudio/Portage/Updates/$today
smart-live-rebuild -- --keep-going
echo "Preserved-rebuild:" >> /home/gentoostudio/Portage/Updates/$today
emerge -p @preserved-rebuild >> /home/gentoostudio/Portage/Updates/$today
emerge --keep-going @preserved-rebuild
echo "Removed packages:" > /home/gentoostudio/Portage/Depclean/$today
emerge -p --depclean >> /home/gentoostudio/Portage/Depclean/$today
emerge --depclean
echo "Revdep-rebuild:" >> /home/gentoostudio/Portage/Updates/$today
revdep-rebuild -p >> /home/gentoostudio/Portage/Updates/$today
revdep-rebuild
emerge @preserved-rebuild
|
Sometimes when layman is run, it wants you to decide which conflicting version to use. How can I include in my script an automatic selection of "mc" (mine-conflict)? _________________ decibel Linux: https://decibellinux.org
Github: https://github.com/Gentoo-Music-and-Audio-Technology
Facebook: https://www.facebook.com/decibellinux
Discord: https://discord.gg/73XV24dNPN |
|
Back to top |
|
|
dol-sen Retired Dev
Joined: 30 Jun 2002 Posts: 2805 Location: Richmond, BC, Canada
|
Posted: Mon May 13, 2013 9:28 pm Post subject: |
|
|
First. Layman has nothing to do with conflicting versions of pkgs. Layman is only a repository installer and syncing app. For conflicts you will need to set priorities of the overlays you have installed. I'm not sure what else you may need to do.
Second. eix is capable of syncing the main tree and any installed layman overlays. So, you can streamline that into one operation. _________________ Brian
Porthole, the Portage GUI frontend irc@freenode: #gentoo-guis, #porthole, Blog
layman, gentoolkit, CoreBuilder, esearch... |
|
Back to top |
|
|
Ant P. Watchman
Joined: 18 Apr 2009 Posts: 6920
|
Posted: Tue May 14, 2013 4:36 am Post subject: |
|
|
dol-sen wrote: | First. Layman has nothing to do with conflicting versions of pkgs. |
I suspect these are actually svn merge conflicts being described, which have nothing to do with either. |
|
Back to top |
|
|
The Doctor Moderator
Joined: 27 Jul 2010 Posts: 2678
|
Posted: Tue May 14, 2013 5:20 am Post subject: |
|
|
2 observations. First, masking the conflicting packages from the unwanted source using <catagory>/<foo>::overlay might solve your first issue, if I understand it correctly.
Second, shouldn't preserved-rebuild precede revdep-rebuild since preserved-rebuild deletes libraries and links to new ones? Point 2.1 revdep-rebuild should not be needed at all since preserved-rebuild does the same thing, just a bit more elegantly (ie, not breaking things first). _________________ First things first, but not necessarily in that order.
Apologies if I take a while to respond. I'm currently working on the dematerialization circuit for my blue box. |
|
Back to top |
|
|
audiodef Watchman
Joined: 06 Jul 2005 Posts: 6639 Location: The soundosphere
|
|
Back to top |
|
|
dol-sen Retired Dev
Joined: 30 Jun 2002 Posts: 2805 Location: Richmond, BC, Canada
|
Posted: Tue May 14, 2013 3:00 pm Post subject: |
|
|
Ant P. wrote: | dol-sen wrote: | First. Layman has nothing to do with conflicting versions of pkgs. |
I suspect these are actually svn merge conflicts being described, which have nothing to do with either. |
Yes, I believe you are correct. I missed that possibility when reading the post before.
No, layman does not set any options to automatically resolve merge confilct in the VCS's. However, I did add to layman.cfg options to enable whatever svn, git, etc. options are available for that type of VCS being used. They are not specific to each overlay installed, but to all installed overlay of each type. Just un-comment the correct one and add the confilct resolution options if the vcs is capable/has the options
Code: | #-----------------------------------------------------------
# Command additional options
#
# These commnad options will be added to the above commands
# when the overlay is added or synced.
#
# note: there are some options hardcoded in the backend
# scripts already. All VCS types listed here are
# for general consistency. Options may not be available
# or recommended for all VCS types and/or add/sync operations.
# Any options defined here are deemed:
# "Use at your own risk"
# and are not supported.
#
# eg:
# svn_addopts : --config-option=config:miscellany:use-commit-times=yes
#
#bzr_addopts :
#bzr_syncopts :
#cvs_addopts :
#cvs_syncopts :
#darcs_addopts :
#darcs_syncopts :
#git_addopts :
#git_syncopts :
#mercurial_addopts :
#mercurial_syncopts :
#rsync_syncopts :
#svn_addopts :
#svn_syncopts :
#g-common_generateopts :
#g-common_syncopts :
|
_________________ Brian
Porthole, the Portage GUI frontend irc@freenode: #gentoo-guis, #porthole, Blog
layman, gentoolkit, CoreBuilder, esearch... |
|
Back to top |
|
|
audiodef Watchman
Joined: 06 Jul 2005 Posts: 6639 Location: The soundosphere
|
|
Back to top |
|
|
|
|
You cannot post new topics in this forum You cannot reply to topics in this forum You cannot edit your posts in this forum You cannot delete your posts in this forum You cannot vote in polls in this forum
|
|