emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[O] local.mk and SUDO


From: Martyn Jago
Subject: [O] local.mk and SUDO
Date: Fri, 27 Apr 2012 13:35:48 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (darwin)

I have a local.mk set up with my particular settings, and with SUDO
set to blank, as per the comment in default.mk:

,----[default.mk]
| # How to obtain administrative privileges
| # SUDO        =       # leave blank if you don't need this
| SUDO  = sudo
`----

...since my org-mode files location doesn't require supervisor access
(typically I have 4 org-mode installs, and 4 Emacs versions for testing,
although currently I'm just running my working system).

However, when I've just gone to run `make up2' (awesome command by the
way), I get the error:

--8<---------------cut here---------------start------------->8---
> make up2
git remote update
Fetching origin
git pull
Updating abd49c8..0233eb9
error: Your local changes to the following files would be overwritten by merge:
        contrib/lisp/org-export.el
        lisp/ob-R.el
        lisp/ob-python.el
        lisp/ob.el
        lisp/org-agenda.el
        lisp/org-beamer.el
        lisp/org-bibtex.el
        lisp/org-capture.el
        lisp/org-clock.el
        lisp/org-colview-xemacs.el
        lisp/org-colview.el
        lisp/org-ctags.el
        lisp/org-exp.el
        lisp/org-faces.el
        lisp/org-footnote.el
        lisp/org-gnus.el
        lisp/org-latex.el
        lisp/org-mouse.el
        lisp/org-odt.el
        lisp/org-publish.el
        lisp/org-table.el
        lisp/org.el
--8<---------------cut here---------------end--------------->8---

After investigation it turns out the problem is a permissions issue:

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
old mode 100644
new mode 100755
--8<---------------cut here---------------end--------------->8---

After further investigation, I have modified git config to overide the
core.filemode setting which works for me:

,----
| core.fileMode
|        If false, the executable bit differences between the index and the
|        working copy are ignored; useful on broken filesystems like FAT.
|        See git-update-index(1). True by default.
`----

--8<---------------cut here---------------start------------->8---
git config core.filemode false
--8<---------------cut here---------------end--------------->8---


So really - this is just a heads-up of my experience setting SUDO to
blank, but it would be nice to know if this is expected behavior? If it
turns out that it is, then perhaps I can supply a documentation patch
(an extra comment in default.mk).

HTH

Best, Martyn




reply via email to

[Prev in Thread] Current Thread [Next in Thread]