[gitec] Falha em atualizar Portal Modelo em ambiente de desenvolvimento

Délio Azeredo intellq em gmail.com
Terça Setembro 18 08:10:43 BRT 2018


Amigos, estou precisando de ajuda.

Originalmente, instalei o Portal Modelo 3.0 em "ambiente de
desenvolvimento", seguindo instruções deste link:

https://colab.interlegis.leg.br/wiki/AmbienteDesenvolvimentoPortalModelo

Estou tentando atualizá-lo seguindo esses passos:

*$ cd portalmodelo
$ git pull
$ ./bin/buildout
 ou
$ ./bin/develop rb (roda o último buildout)*

Mas não tenho sucesso na atualização. Meu "git pull" está retornando ok:


*cmm em servidor2:/var/interlegis/portalmodelo$ git pullAlready up-to-date.*

Porém ao dar o ./bin/buildout acontecem vários erros (o mesmo acontece com
./bin/develop rb):


























































































*cmm em servidor2:/var/interlegis/portalmodelo$ ./bin/buildoutmr.developer:
Queued 'eea.rdfmarshaller' for checkout.mr.developer: Queued
'interlegis.intranetmodelo.departments' for checkout.mr.developer: Queued
'interlegis.intranetmodelo.policy' for checkout.mr.developer: Queued
'interlegis.portalmodelo.api' for checkout.mr.developer: Queued
'interlegis.portalmodelo.buscadores' for checkout.mr.developer: Queued
'interlegis.portalmodelo.ombudsman' for checkout.mr.developer: Queued
'interlegis.portalmodelo.pl <http://interlegis.portalmodelo.pl>' for
checkout.mr.developer: Queued 'interlegis.portalmodelo.policy' for
checkout.mr.developer: Queued 'interlegis.portalmodelo.theme' for
checkout.mr.developer: Queued 'interlegis.portalmodelo.transparency' for
checkout.mr.developer: Queued 'rows' for checkout.mr.developer: Updated
'interlegis.portalmodelo.api' with git.mr.developer: Updated
'interlegis.intranetmodelo.departments' with git.mr.developer: Updated
'interlegis.portalmodelo.buscadores' with git.mr.developer: git pull of
'interlegis.portalmodelo.buscadores' failed.mr.developer: From
github.com:interlegis/interlegis.portalmodelo.buscadoresmr.developer:
7ba9df2..a926641  master     -> origin/mastermr.developer: error: Your
local changes to the following files would be overwritten by
merge:mr.developer:
src/interlegis/portalmodelo/buscadores/portlets/buscaleg.pt
<http://buscaleg.pt>mr.developer:
src/interlegis/portalmodelo/buscadores/portlets/lexml.pt
<http://lexml.pt>mr.developer: Please, commit your changes or stash them
before you can merge.mr.developer: Abortingmr.developer: mr.developer:
Updated 'interlegis.intranetmodelo.policy' with git.mr.developer: git pull
of 'interlegis.intranetmodelo.policy' failed.mr.developer: From
github.com:interlegis/interlegis.intranetmodelo.policymr.developer:
c68dc6f..3e443a8  master     -> origin/mastermr.developer:  * [new
tag]         1.0b7      -> 1.0b7mr.developer: error: Your local changes to
the following files would be overwritten by merge:mr.developer:
CHANGES.rstmr.developer:     setup.cfgmr.developer:
setup.pymr.developer:
src/interlegis/intranetmodelo/policy/Extensions/Install.pymr.developer:
src/interlegis/intranetmodelo/policy/profiles/uninstall/interlegis.intranetmodelo.policy.txtmr.developer:
Please, commit your changes or stash them before you can
merge.mr.developer: Abortingmr.developer: mr.developer: Cloned
'eea.rdfmarshaller' with git.mr.developer: Updated
'interlegis.portalmodelo.ombudsman' with git.mr.developer: git pull of
'interlegis.portalmodelo.ombudsman' failed.mr.developer: From
github.com:interlegis/interlegis.portalmodelo.ombudsmanmr.developer:
b273121..ea2f867  master     -> origin/mastermr.developer:  * [new
tag]         1.2        -> 1.2mr.developer:  * [new tag]         1.3
-> 1.3mr.developer:  * [new tag]         1.4        -> 1.4mr.developer:
error: Your local changes to the following files would be overwritten by
merge:mr.developer:     CHANGES.rstmr.developer:     setup.cfgmr.developer:
    setup.pymr.developer:
src/interlegis/portalmodelo/ombudsman/browser/claim.pymr.developer:
src/interlegis/portalmodelo/ombudsman/browser/configure.zcmlmr.developer:
    src/interlegis/portalmodelo/ombudsman/browser/json_api.pymr.developer:

src/interlegis/portalmodelo/ombudsman/browser/ombudsoffice.pymr.developer:

src/interlegis/portalmodelo/ombudsman/browser/templates/ombudsoffice_view.pt
<http://ombudsoffice_view.pt>mr.developer:
src/interlegis/portalmodelo/ombudsman/configure.zcmlmr.developer:
src/interlegis/portalmodelo/ombudsman/interfaces/claim.pymr.developer:
src/interlegis/portalmodelo/ombudsman/locales/interlegis.portalmodelo.ombudsman.potmr.developer:
    src/interlegis/portalmodelo/ombudsman/locales/plone.potmr.developer:

src/interlegis/portalmodelo/ombudsman/locales/pt_BR/LC_MESSAGES/interlegis.portalmodelo.ombudsman.pomr.developer:

src/interlegis/portalmodelo/ombudsman/locales/pt_BR/LC_MESSAGES/plone.pomr.developer:
    src/interlegis/portalmodelo/ombudsman/tests/test_claim.pymr.developer:
Please, commit your changes or stash them before you can
merge.mr.developer: Abortingmr.developer: mr.developer: Updated
'interlegis.portalmodelo.pl <http://interlegis.portalmodelo.pl>' with
git.mr.developer: git pull of 'interlegis.portalmodelo.pl
<http://interlegis.portalmodelo.pl>' failed.mr.developer: From
github.com:interlegis/interlegis.portalmodelo.pl
<http://interlegis.portalmodelo.pl>mr.developer:    1b530af..7eba0ab
master     -> origin/mastermr.developer:  * [new tag]         1.0rc3     ->
1.0rc3mr.developer:  * [new tag]         1.0rc6     -> 1.0rc6mr.developer:
error: Your local changes to the following files would be overwritten by
merge:mr.developer:     CHANGES.rstmr.developer:     setup.cfgmr.developer:
    setup.pymr.developer:
src/interlegis/portalmodelo/pl/browser/legislature.pymr.developer:
src/interlegis/portalmodelo/pl/browser/parliamentarian.pymr.developer:
src/interlegis/portalmodelo/pl/browser/templates/legislature_members.pt
<http://legislature_members.pt>mr.developer:
src/interlegis/portalmodelo/pl/browser/templates/parliamentarians.pt
<http://parliamentarians.pt>mr.developer:
src/interlegis/portalmodelo/pl/config.pymr.developer:
src/interlegis/portalmodelo/pl/interfaces.pymr.developer:
src/interlegis/portalmodelo/pl/validators.pymr.developer: Please, commit
your changes or stash them before you can merge.mr.developer:
Abortingmr.developer: mr.developer: There have been errors, see messages
above.*************** PICKED VERSIONS
****************[versions]*************** /PICKED VERSIONS ****************

Observações:

- Criei meu buildout.cfg como cópia do development.cfg. Está correto?
- Não fiz alterações no código fonte, como sugerem as mensagens de erro
- Tentei dar um "git reset --hard" (comando que achei no google), que
teoricamente eliminaria inconsistência entre o local e o remoto, mas os
erros aumentaram ainda mais

Aceito toda ajuda dos colegas.

Délio S. Azeredo
Chefe de TI
Câmara Municipal de Marabá
-------------- Próxima Parte ----------
Um anexo em HTML foi limpo...
URL: <http://listas.interlegis.gov.br/pipermail/gitec/attachments/20180918/85ada10a/attachment.html>


Mais detalhes sobre a lista de discussão GITEC