Tails

#3 Updated by zen 2020-04-29 17:24:43

In order to reproduce the problem, when this happens again, let’s make sure to save:

• /var/log/weblate/update.log*
• A tarball of the weblate and integration repos:
  • /var/lib/weblate/repositories/vcs/tails
  • /var/lib/weblate/repositories/integration

#4 Updated by hefee 2020-04-29 17:25:25

2020-04-14 22:00:06,699 - UWC - root(ERROR): Couldn't update master with fast-forward strategy. Reset remote to eceb4a8a35279930175b07e2dd8a0f212c218835 again
2020-04-14 22:00:06,700 - UWC - root(ERROR): -- Something unexpected happened. Giving up. --
Traceback (most recent call last):
  File "/var/lib/weblate/scripts/update_weblate_components.py", line 230, in <module>
    main()
  File "/var/lib/weblate/scripts/tailsWeblate.py", line 39, in func
    f()
  File "/var/lib/weblate/scripts/update_weblate_components.py", line 195, in main
    _r.pull(local,ff_only=True)
  File "/usr/lib/python3/dist-packages/git/remote.py", line 771, in pull
    res = self._get_fetch_info_from_stderr(proc, progress)
  File "/usr/lib/python3/dist-packages/git/remote.py", line 638, in _get_fetch_info_from_stderr
    proc.wait(stderr=stderr_text)
  File "/usr/lib/python3/dist-packages/git/cmd.py", line 291, in wait
    raise GitCommandError(self.args, status, errstr)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git pull --ff-only -v cron master
  stderr: 'error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.'
Traceback (most recent call last):
  File "/var/lib/weblate/scripts/update_weblate_components.py", line 230, in <module>
    main()
  File "/var/lib/weblate/scripts/tailsWeblate.py", line 39, in func
    f()
  File "/var/lib/weblate/scripts/update_weblate_components.py", line 195, in main
    _r.pull(local,ff_only=True)
  File "/usr/lib/python3/dist-packages/git/remote.py", line 771, in pull
    res = self._get_fetch_info_from_stderr(proc, progress)
  File "/usr/lib/python3/dist-packages/git/remote.py", line 638, in _get_fetch_info_from_stderr
    proc.wait(stderr=stderr_text)
  File "/usr/lib/python3/dist-packages/git/cmd.py", line 291, in wait
    raise GitCommandError(self.args, status, errstr)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git pull --ff-only -v cron master
  stderr: 'error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.'