Massive updates in -current

solarfields · 06-27-2012, 09:30 AM

don't worry mate...

as long as they do not make you more happy than a girl

sanjioh · 06-29-2012, 02:41 AM

Quote:

Originally Posted by audriusk

Just finished rebuilding additional packages depending on Python, everything went great. Thanks to Pat and the crew for this nice batch of updates!

I have one question though: mercurial's doinst.sh.gz contains the following two lines:

Code:

config etc/mercurial/hgrc.d/hgk.rc.new                                           
rm -f etc/mercurial/hgrc.d/hgk.rc.new

Can someone enlighten me about the reason behind the last line? Is this intentional or simply a leftover from some tinkering with the code?

Hi,
any news on this subject? What do you people think?

volkerdi · 06-29-2012, 02:29 PM

Hi, the config() handling of hgk.rc.new is there to let people comment out an optional feature without every package upgrade to mercurial enabling it again.

GazL · 06-29-2012, 03:17 PM

I don't think it's the config() handling that is at question here Pat. It's the rm outside of it.

Code:

config() {
  NEW="$1"
  OLD="`dirname $NEW`/`basename $NEW .new`"
  # If there's no config file by that name, mv it over:
  if [ ! -r $OLD ]; then
    mv $NEW $OLD
  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
    rm $NEW
  fi
  # Otherwise, we leave the .new copy for the admin to consider...
}
config etc/mercurial/hgrc.d/hgk.rc.new
rm -f etc/mercurial/hgrc.d/hgk.rc.new

- If old doesn't exist move new to old
- else if new and old are the same remove new
- else leave it for the admin to sort out
- but then it gets deleted anyway outside of config(), so the admin will never get to see it.

volkerdi · 06-29-2012, 06:13 PM

That comment in config() is just part of the boilerplate... in this case the file is not expected to change.

sanjioh · 06-30-2012, 05:05 AM

Thanks for your answers, Patrick. But what is still not clear to me is the last statement of the script:

Quote:

rm -f etc/mercurial/hgrc.d/hgk.rc.new

Why remove the .new file if we want to let the admin choose how to deal with it?
Thanks again!

wildwizard · 06-30-2012, 05:20 AM

I think what he means here is that the config() function is a generic function that he uses for everything but in this case the .rc file should never change so you don't need to even look at it.

And of course keeping with the same old system of .rc.new means that if it does in fact change in the future he can always remove that rm line and let the admin deal with it.

Also note that the check he uses to see if the file is the same requires the file to be exactly the same, even an extra blank line will cause that test to fail.

sanjioh · 06-30-2012, 05:26 AM

Oh, ok now it does definetly make sense to me

thanks for the clarification!

audriusk · 07-01-2012, 08:15 AM

Ah, so this last line is for disabling the config() code instead of removing it completely, so that in the future it could be re-enabled quickly if needed.

Thanks Pat for answering and wildwizard for detailed explanation!