2020-06-28T13:00:01Z

1 files changed, 15 insertions, 32 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 0cbbce6f64da..67d0b08de85c 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,40 +13,23 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   623d4ab2647..9207fdd5442  master     -> origin/master
-Updating 623d4ab2647..9207fdd5442
-Fast-forward
- dev-python/hypothesis/Manifest                     |  1 +
- dev-python/hypothesis/hypothesis-5.18.3.ebuild     | 56 ++++++++++++++++
- dev-python/importlib_metadata/Manifest             |  1 +
- .../importlib_metadata-1.7.0.ebuild                | 48 ++++++++++++++
- dev-python/pyfakefs/pyfakefs-3.7.2.ebuild          |  2 +-
- dev-python/pyfakefs/pyfakefs-4.0.2.ebuild          |  2 +-
- dev-python/tox/Manifest                            |  1 +
- dev-python/tox/tox-3.16.0.ebuild                   | 71 ++++++++++++++++++++
- dev-vcs/mercurial/Manifest                         |  2 +-
- ...mercurial-5.4.ebuild => mercurial-5.4.1.ebuild} | 11 +---
- dev-vcs/mercurial/mercurial-9999.ebuild            | 12 +---
- net-analyzer/arpwatch/Manifest                     |  2 +
- net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild   |  2 +-
- net-analyzer/arpwatch/arpwatch-3.1.ebuild          | 75 ++++++++++++++++++++++
- net-analyzer/arpwatch/files/arpwatch.confd         | 11 ----
- net-analyzer/arpwatch/files/arpwatch.confd-r2      | 18 ++++++
- net-analyzer/arpwatch/files/arpwatch.initd         | 36 -----------
- net-analyzer/arpwatch/files/arpwatch.initd-r2      | 33 ++++++++++
- 18 files changed, 313 insertions(+), 71 deletions(-)
- create mode 100644 dev-python/hypothesis/hypothesis-5.18.3.ebuild
- create mode 100644 dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild
- create mode 100644 dev-python/tox/tox-3.16.0.ebuild
- rename dev-vcs/mercurial/{mercurial-5.4.ebuild => mercurial-5.4.1.ebuild} (95%)
- create mode 100644 net-analyzer/arpwatch/arpwatch-3.1.ebuild
- delete mode 100644 net-analyzer/arpwatch/files/arpwatch.confd
- create mode 100644 net-analyzer/arpwatch/files/arpwatch.confd-r2
- delete mode 100644 net-analyzer/arpwatch/files/arpwatch.initd
- create mode 100644 net-analyzer/arpwatch/files/arpwatch.initd-r2
+   9207fdd5442..0f0e394cc45  master     -> origin/master
+You are not currently on a branch.
+Please specify which branch you want to merge with.
+See git-pull(1) for details.
+
+    git pull <remote> <branch>
+
+*** syncing gentoo
+!!! failed syncing gentoo
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint sync gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files:  19% (17539/89449)
Updating files:  20% (17890/89449)
Updating files:  21% (18785/89449)
Updating files:  22% (19679/89449)
Updating files:  23% (20574/89449)
Updating files:  24% (21468/89449)
Updating files:  25% (22363/89449)
Updating files:  26% (23257/89449)
Updating files:  27% (24152/89449)
Updating files:  28% (25046/89449)
Updating files:  29% (25941/89449)
Updating files:  30% (26835/89449)
Updating files:  31% (27730/89449)
Updating files:  32% (28624/89449)
Updating files:  33% (29519/89449)
Updating files:  34% (30413/89449)
Updating files:  35% (31308/89449)
Updating files:  36% (32202/89449)
Updating files:  37% (33097/89449)
Updating files:  37% (33943/89449)
Updating files:  38% (33991/89449)
Updating files:  39% (34886/89449)
Updating files:  40% (35780/89449)
Updating files:  41% (36675/89449)
Updating files:  42% (37569/89449)
Updating files:  43% (38464/89449)
Updating files:  44% (39358/89449)
Updating files:  45% (40253/89449)
Updating files:  46% (41147/89449)
Updating files:  47% (42042/89449)
Updating files:  48% (42936/89449)
Updating files:  49% (43831/89449)
Updating files:  50% (44725/89449)
Updating files:  51% (45619/89449)
Updating files:  52% (46514/89449)
Updating files:  53% (47408/89449)
Updating files:  54% (48303/89449)
Updating files:  54% (48793/89449)
Updating files:  55% (49197/89449)
Updating files:  56% (50092/89449)
Updating files:  57% (50986/89449)
Updating files:  58% (51881/89449)
Updating files:  59% (52775/89449)
Updating files:  60% (53670/89449)
Updating files:  61% (54564/89449)
Updating files:  62% (55459/89449)
Updating files:  63% (56353/89449)
Updating files:  64% (57248/89449)
Updating files:  65% (58142/89449)
Updating files:  66% (59037/89449)
Updating files:  67% (59931/89449)
Updating files:  68% (60826/89449)
Updating files:  69% (61720/89449)
Updating files:  70% (62615/89449)
Updating files:  71% (63509/89449)
Updating files:  72% (64404/89449)
Updating files:  72% (64845/89449)
Updating files:  73% (65298/89449)
Updating files:  74% (66193/89449)
Updating files:  75% (67087/89449)
Updating files:  76% (67982/89449)
Updating files:  77% (68876/89449)
Updating files:  78% (69771/89449)
Updating files:  79% (70665/89449)
Updating files:  80% (71560/89449)
Updating files:  81% (72454/89449)
Updating files:  82% (73349/89449)
Updating files:  83% (74243/89449)
Updating files:  84% (75138/89449)
Updating files:  85% (76032/89449)
Updating files:  86% (76927/89449)
Updating files:  87% (77821/89449)
Updating files:  87% (78021/89449)
Updating files:  88% (78716/89449)
Updating files:  89% (79610/89449)
Updating files:  90% (80505/89449)
Updating files:  91% (81399/89449)
Updating files:  92% (82294/89449)
Updating files:  93% (83188/89449)
Updating files:  94% (84083/89449)
Updating files:  95% (84977/89449)
Updating files:  96% (85872/89449)
Updating files:  97% (86766/89449)
Updating files:  98% (87661/89449)
Updating files:  99% (88555/89449)
Updating files: 100% (89449/89449)
Updating files: 100% (89449/89449), done.
 *** syncing gentoo
 *** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo