Re: fink selfupdate failing
Chris Schram via Fink-beginners <[email protected]>
| Newsgroups | gmane.os.apple.fink.beginners |
|---|---|
| Organization | Where the hell is Langlois, Oregon? |
| Message-ID | <[email protected]> |
On 2019-11-02, Hanspeter Niederstrasser <[email protected]> wrote: > On 11/1/19 2:49 PM, Chris Schram via Fink-beginners wrote: >> I must have had to edit something recently to get gpgme11 to build, but >> now it's coming back to haunt me. The error message does not give enough >> of a clue how to fix this. Can someone give me simple step-by-step >> instructions? Thanks. >> >> I will now run the git command to retrieve the latest package descriptions. >> After that, the core packages will be updated right away; you should then >> update the other packages using commands like 'fink update-all'. >> >> /usr/bin/git fetch --quiet origin >> /usr/bin/git checkout --quiet master >> /usr/bin/git merge --ff-only --quiet origin/master >> error: Your local changes to the following files would be overwritten by merge: >> 10.9-libcxx/stable/main/finkinfo/crypto/gpgme11.info >> 10.9-libcxx/stable/main/finkinfo/crypto/gpgme11.patch >> Please commit your changes or stash them before you merge. >> Aborting >> ### execution of /usr/bin/git failed, exit code 1 > > cd /opt/sw/fink/dists/stable/main/finkinfo/crypto > git checkout gpgme11.info gpgme11.patch > > You can then use `git status` to see if those 2 files have been reset > (if not listed, then they're no longer modified and fink selfupdate will > work). Easy for you. Mysterious for me. The trick worked. Thanks. -- [email protected] is a filtered spam magnet. Email replies may be lost. You're better off replying to this newsgroup. _______________________________________________ Fink-beginners mailing list [email protected] List archive: https://sourceforge.net/p/fink/mailman/fink-users/ Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-beginners