688239 - make build fails if you update a confg file

Status: VERIFIED FIXED

(Cloud Services :: Server: Other, defect)

Description

[Toby Elliott [:telliott]]

Steps to reproduce:

1) checkout server-full
2) edit one of the etc/*.cfg files
3) make build (twice if the first one chokes)

Gives the following at the end:

Cleaning up...
bin/buildapp -c prod -i http://pypi.python.org/simple server-core,server-reg,server-storage
The current channel is prod.
Building the app 
  Checking the environ   [ok]
  Updating the repo The code was changed locally, aborting!
You can use --force but all uncommited changes will be discarded.
[fail][fail]


Forcing a build failure because of small changes seems problematic.

Comment 1

[Tarek Ziadé (:tarek)]

yeah. one option is to make a white list.

For server-full, maybe etc/

Comment 2

[Tarek Ziadé (:tarek)]

Also: if you build a prod version, you are supposed to be on a tag, so a change means you are now on a different set of files.

So, I am not sure if being lose on any file is a good idea

Comment 3

[Tarek Ziadé (:tarek)]

So, after a bit of IRC:

1/ the dev channel should ignore changes on the current project (not the deps)
2/ the warning when the prod refuses to continue should explain that any change should be done on a dev channel

Comment 4

[Tarek Ziadé (:tarek)]

This is already fixed. I have adapted the displayed message a bit.

Comment 5

[James Bonacci [:jbonacci]]

OK. Marking as Verified.

Comment 6

[Denis]

I still have this isue. Few minutes ago I did:
$ hg pull
$ hg update
$ make build

And now I have:
Building the app 
  Checking the environ                                                                         [ok]
  Updating the repo The code was changed locally, aborting!
You can use --force but all uncommited changes will be discarded.
                                                                                               [fail]                                                                                               [fail]
# Pre-compile mako templates into the correct directories.
for TMPL in `find . -name '*.mako'`; do ./bin/python -c "from mako.template import Template; Template(filename='$TMPL', module_directory='`dirname $TMPL`', uri='`basename $TMPL`')"; done;

Comment 7

[aurelien.grosdidier]

I still have it too.

Comment 8

[Ryan Kelly [:rfkelly]]

Denis, it's possible that you did not get the updated error wording mentioned in Comment 4, due to originally building the project before this fix was committed.  You should be able to get the update working by doing:

  $ make build CHANNEL=dev


The simplest fix here seems to be building the dev channel by default.  This seems OK given the stability of the project at this point in its lifecycle.  Toby, thoughts?

Comment 9

[Toby Elliott [:telliott]]

That does seem the path of least resistance at this point.

Comment 10

[Ryan Kelly [:rfkelly]]

It's done:

  http://hg.mozilla.org/services/server-full/rev/528ff5e44486

Users with existing checkouts will need to remove the .channel file to build the new channel, but at least we won't foist this upon any new users.

Comment 11

[aurelien.grosdidier]

Thanks a lot, it's fixed now :)