summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'elementary.txt')
-rw-r--r--elementary.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/elementary.txt b/elementary.txt
index 8226494baeb4..04c8a934cb8d 100644
--- a/elementary.txt
+++ b/elementary.txt
@@ -12,7 +12,6 @@
'uri': 'git://github.com/pimvullers/elementary.git'}],
'status': 'unofficial'}
$ pmaint sync elementary
-*** syncing elementary
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
@@ -27,10 +26,11 @@ or --ff-only on the command line to override the configured default per
invocation.
Already up to date.
+*** syncing elementary
*** synced elementary
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 elementary
- * x11-libs/bamf-0.5.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ * x11-libs/bamf-0.5.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
* Cache regen failed with 1