Просмотр исходного кода

Merge branch 'develop'

tags/v0.3
Ben Kurtovic 10 лет назад
Родитель
Сommit
96860af2c3
2 измененных файлов: 4 добавлений и 3 удалений
  1. +1
    -1
      gitup/__init__.py
  2. +3
    -2
      gitup/update.py

+ 1
- 1
gitup/__init__.py Просмотреть файл

@@ -10,5 +10,5 @@ gitup: the git repository updater
__author__ = "Ben Kurtovic"
__copyright__ = "Copyright (C) 2011-2014 Ben Kurtovic"
__license__ = "MIT License"
__version__ = "0.2"
__version__ = "0.2.1"
__email__ = "ben.kurtovic@gmail.com"

+ 3
- 2
gitup/update.py Просмотреть файл

@@ -92,12 +92,13 @@ def _fetch_remotes(remotes):
msg = err.command[0].replace("Error when fetching: ", "")
if not msg.endswith("."):
msg += "."
print(RED + "error:", msg)
print(":", RED + "error:", msg)
return
except AssertionError: # Seems to be the result of a bug in GitPython
# This happens when git initiates an auto-gc during fetch:
print(RED + "error:", "something went wrong in GitPython,",
print(":", RED + "error:", "something went wrong in GitPython,",
"but the fetch might have been successful.")
return
rlist = []
for attr, singular, plural in info:
names = [_get_name(res.ref)


Загрузка…
Отмена
Сохранить