Date: Wed, 17 Jul 2013 17:37:15 -0500 From: Scot Hetzel <swhetzel@gmail.com> To: mexas@bristol.ac.uk Cc: freebsd-ports@freebsd.org Subject: Re: svn diff/patch change file permission in cad/feappv Message-ID: <CACdU%2Bf8m=1GZN2MM4tGRQ2208UDZOOZL0mpACVv6TPfx3RdDVw@mail.gmail.com> In-Reply-To: <201307172226.r6HMQfUH025295@mech-cluster241.men.bris.ac.uk> References: <CACdU%2Bf9wi_mmWEpGTbf4FQZ9C4S-%2BbKwBHtKaRv4zqa-Cve%2B8A@mail.gmail.com> <201307172226.r6HMQfUH025295@mech-cluster241.men.bris.ac.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jul 17, 2013 at 5:26 PM, Anton Shterenlikht <mexas@bris.ac.uk> wrote: > >From swhetzel@gmail.com Wed Jul 17 23:20:37 2013 >>On Wed, Jul 17, 2013 at 4:48 PM, Anton Shterenlikht <mexas@bris.ac.uk> wrote: >>> >From swhetzel@gmail.com Wed Jul 17 22:44:56 2013 >>>> >>>>On Wed, Jul 17, 2013 at 9:50 AM, Anton Shterenlikht <mexas@bris.ac.uk> wrote: >>>>> I'm updating cad/feappv. >>>>> I noticed that svn diff, followed by svn patch >>>>> changes file permissions for 2 files out of 3. >>>>> Please help >>>>> >>>>> After I finished updating the port, I did: >>>>> >>>>> # pwd >>>>> /usr/ports/cad/feappv >>>>> # ls -al >>>>> total 24 >>>>> drwxr-xr-x 2 root wheel 512 Jul 17 15:45 . >>>>> drwxr-xr-x 108 root wheel 2560 Mar 22 03:45 .. >>>>> -rw-r--r-- 1 root wheel 1541 Jul 17 15:41 Makefile >>>>> -rw-r--r-- 1 root wheel 268 Jul 17 15:38 distinfo >>>>> -rw-r--r-- 1 root wheel 473 Jul 17 15:39 pkg-descr >>>>> # svn diff > feappv.diff >>>>> # svn revert * >>>>> Reverted 'Makefile' >>>>> Reverted 'distinfo' >>>>> Skipped 'feappv.diff' >>>>> Reverted 'pkg-descr' >>>>> # ls -al >>>>> total 32 >>>>> drwxr-xr-x 2 root wheel 512 Jul 17 15:46 . >>>>> drwxr-xr-x 108 root wheel 2560 Mar 22 03:45 .. >>>>> -rw-r--r-- 1 root wheel 1613 Jul 17 15:46 Makefile >>>>> -rw-r--r-- 1 root wheel 268 Jul 17 15:46 distinfo >>>>> -rw-r--r-- 1 root wheel 2439 Jul 17 15:46 feappv.diff >>>>> -rw-r--r-- 1 root wheel 474 Jul 17 15:46 pkg-descr >>>>> # svn patch feappv.diff >>>>> U Makefile >>>>> U distinfo >>>>> U pkg-descr >>>>> # ls -al >>>>> total 32 >>>>> drwxr-xr-x 2 root wheel 512 Jul 17 15:46 . >>>>> drwxr-xr-x 108 root wheel 2560 Mar 22 03:45 .. >>>>> -rw------- 1 root wheel 1541 Jul 17 15:46 Makefile >>>>> -rw------- 1 root wheel 268 Jul 17 15:46 distinfo >>>>> -rw-r--r-- 1 root wheel 2439 Jul 17 15:46 feappv.diff >>>>> -rw-r--r-- 1 root wheel 473 Jul 17 15:46 pkg-descr >>>>> # >>>>> >>>>> Note that now Makefile and distinfo have 600 perms, >>>>> instead of 644. Have I missed some svn diff/patch >>>>> option? Or is there a reason for the change in permissions? >>>>> >>>> >>>>Do you have umask set in your environment? As a umask of 077 would >>>>explain the issue. >>> >>> no, no umask anywhere. >>> >>> Still, why would only 2 files out of 3 change permissions? >> >>My best guess is that feappv.diff patch is being applied to only patch >>Makefile and distinfo. pkg-descr is not being touched by the patch. >>That is why I suspect that umask might be involved. > > sorry, I could've been more clear. > Yes, the patch touches 3 files: Makefile, distinfo, pkg-descr. > For some reason, Makefile and distinfo changed permission > after the patch is applied. > The only other theory I have is that when you had edited the Makefile and distinfo the umask was set to 077. Which changed the file permissions. Then you used svn diff to create the feappv.diff patch. SVN may have recorded the file permission changes in the patch file. Is there anything extra in the patch file? Otherwise I'm out of ideals. -- DISCLAIMER: No electrons were maimed while sending this message. Only slightly bruised.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACdU%2Bf8m=1GZN2MM4tGRQ2208UDZOOZL0mpACVv6TPfx3RdDVw>