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

rafahela em interlegis.leg.br rafahela em interlegis.leg.br
Quinta Setembro 20 11:37:36 BRT 2018


Bom dia,

Faz sua instalação via docker

https://colab.interlegis.leg.br/wiki/PortalModelo30Docker (https://colab.interlegis.leg.br/wiki/PortalModelo30Docker)

Att,
Rafahela

19 de setembro de 2018 14:14, "Délio Azeredo" <intellq em gmail.com (mailto:intellq em gmail.com?to=%22D%C3%A9lio%20Azeredo%22%20<intellq em gmail.com>)> escreveu:
 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 (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 pull
Already 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/buildout
mr.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.buscadores
mr.developer: 7ba9df2..a926641 master -> origin/master
mr.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: Aborting
mr.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.policy
mr.developer: c68dc6f..3e443a8 master -> origin/master
mr.developer: * [new tag] 1.0b7 -> 1.0b7
mr.developer: error: Your local changes to the following files would be overwritten by merge:
mr.developer: CHANGES.rst
mr.developer: setup.cfg
mr.developer: setup.py
mr.developer: src/interlegis/intranetmodelo/policy/Extensions/Install.py
mr.developer: src/interlegis/intranetmodelo/policy/profiles/uninstall/interlegis.intranetmodelo.policy.txt
mr.developer: Please, commit your changes or stash them before you can merge.
mr.developer: Aborting
mr.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.ombudsman
mr.developer: b273121..ea2f867 master -> origin/master
mr.developer: * [new tag] 1.2 -> 1.2
mr.developer: * [new tag] 1.3 -> 1.3
mr.developer: * [new tag] 1.4 -> 1.4
mr.developer: error: Your local changes to the following files would be overwritten by merge:
mr.developer: CHANGES.rst
mr.developer: setup.cfg
mr.developer: setup.py
mr.developer: src/interlegis/portalmodelo/ombudsman/browser/claim.py
mr.developer: src/interlegis/portalmodelo/ombudsman/browser/configure.zcml
mr.developer: src/interlegis/portalmodelo/ombudsman/browser/json_api.py
mr.developer: src/interlegis/portalmodelo/ombudsman/browser/ombudsoffice.py
mr.developer: src/interlegis/portalmodelo/ombudsman/browser/templates/ombudsoffice_view.pt (http://ombudsoffice_view.pt)
mr.developer: src/interlegis/portalmodelo/ombudsman/configure.zcml
mr.developer: src/interlegis/portalmodelo/ombudsman/interfaces/claim.py
mr.developer: src/interlegis/portalmodelo/ombudsman/locales/interlegis.portalmodelo.ombudsman.pot
mr.developer: src/interlegis/portalmodelo/ombudsman/locales/plone.pot
mr.developer: src/interlegis/portalmodelo/ombudsman/locales/pt_BR/LC_MESSAGES/interlegis.portalmodelo.ombudsman.po
mr.developer: src/interlegis/portalmodelo/ombudsman/locales/pt_BR/LC_MESSAGES/plone.po
mr.developer: src/interlegis/portalmodelo/ombudsman/tests/test_claim.py
mr.developer: Please, commit your changes or stash them before you can merge.
mr.developer: Aborting
mr.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/master
mr.developer: * [new tag] 1.0rc3 -> 1.0rc3
mr.developer: * [new tag] 1.0rc6 -> 1.0rc6
mr.developer: error: Your local changes to the following files would be overwritten by merge:
mr.developer: CHANGES.rst
mr.developer: setup.cfg
mr.developer: setup.py
mr.developer: src/interlegis/portalmodelo/pl/browser/legislature.py
mr.developer: src/interlegis/portalmodelo/pl/browser/parliamentarian.py
mr.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.py
mr.developer: src/interlegis/portalmodelo/pl/interfaces.py
mr.developer: src/interlegis/portalmodelo/pl/validators.py
mr.developer: Please, commit your changes or stash them before you can merge.
mr.developer: Aborting
mr.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/20180920/dd8978dd/attachment.html>


Mais detalhes sobre a lista de discussão GITEC