summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-02-05 12:47:17 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-02-05 12:47:17 +0000
commit5fdcbe0078b0f2ab1be0bf904e7ed2c81b8e59a0 (patch)
tree490d1a14695ac29fbc6347f3fd8dd7c09e0bcd56 /unity-gentoo.html
parent2021-02-05T10:00:01Z (diff)
downloadrepos-5fdcbe0078b0f2ab1be0bf904e7ed2c81b8e59a0.tar.gz
repos-5fdcbe0078b0f2ab1be0bf904e7ed2c81b8e59a0.tar.bz2
repos-5fdcbe0078b0f2ab1be0bf904e7ed2c81b8e59a0.zip
2021-02-05T11:30:01Z
Diffstat (limited to 'unity-gentoo.html')
-rw-r--r--unity-gentoo.html124
1 files changed, 27 insertions, 97 deletions
diff --git a/unity-gentoo.html b/unity-gentoo.html
index 303dd8cf47df..538dc6a9b614 100644
--- a/unity-gentoo.html
+++ b/unity-gentoo.html
@@ -36,129 +36,59 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync unity-gentoo
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://github.com/shiznix/unity-gentoo
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing unity-gentoo
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 4c0a95b2..adb57ce9 master -&gt; origin/master
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced unity-gentoo
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating 4c0a95b2..adb57ce9
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-libs/dee/Manifest | 2 +-
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> ...ebuild =&gt; dee-1.2.7_p20170616_p6_p01-r1.ebuild} | 2 +-
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 unity-gentoo
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-libs/libunity/Manifest | 4 +-
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> ...ild =&gt; libunity-7.1.4_p20190319_p2_p-r1.ebuild} | 2 +-
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> .../libunity/libunity-7.1.4_p20190319_p5.ebuild | 68 ++++++++++++++++++++++
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-python/autopilot/Manifest | 4 +-
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> ... =&gt; autopilot-1.6.0_p20170313_p0_p09-r1.ebuild} | 5 +-
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> .../autopilot-1.6.1_p20210120_p0_p01.ebuild | 3 +-
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-python/configglue/Manifest | 3 -
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-python/configglue/configglue-1.0.ebuild | 21 -------
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-python/configglue/metadata.xml | 12 ----
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-python/pyjunitxml/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> ...01.ebuild =&gt; pyjunitxml-0.6_p_p2_p01-r1.ebuild} | 2 +-
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> dev-python/python-testscenarios/Manifest | 3 -
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> dev-python/python-testscenarios/metadata.xml | 12 ----
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> .../python-testscenarios-0.5.0_p_p3_p01.ebuild | 22 -------
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> dev-util/gdbus-codegen/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> ....66.1.ebuild =&gt; gdbus-codegen-2.66.1-r1.ebuild} | 2 +-
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> 18 files changed, 83 insertions(+), 88 deletions(-)
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> rename dev-libs/dee/{dee-1.2.7_p20170616_p6_p01.ebuild =&gt; dee-1.2.7_p20170616_p6_p01-r1.ebuild} (98%)
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> rename dev-libs/libunity/{libunity-7.1.4_p20190319_p2.ebuild =&gt; libunity-7.1.4_p20190319_p2_p-r1.ebuild} (97%)
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> create mode 100644 dev-libs/libunity/libunity-7.1.4_p20190319_p5.ebuild
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> rename dev-python/autopilot/{autopilot-1.6.0_p20170313_p0_p09.ebuild =&gt; autopilot-1.6.0_p20170313_p0_p09-r1.ebuild} (87%)
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> delete mode 100644 dev-python/configglue/Manifest
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> delete mode 100644 dev-python/configglue/configglue-1.0.ebuild
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> delete mode 100644 dev-python/configglue/metadata.xml
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> rename dev-python/pyjunitxml/{pyjunitxml-0.6_p_p2_p01.ebuild =&gt; pyjunitxml-0.6_p_p2_p01-r1.ebuild} (92%)
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> delete mode 100644 dev-python/python-testscenarios/Manifest
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> delete mode 100644 dev-python/python-testscenarios/metadata.xml
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> delete mode 100644 dev-python/python-testscenarios/python-testscenarios-0.5.0_p_p3_p01.ebuild
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> rename dev-util/gdbus-codegen/{gdbus-codegen-2.66.1.ebuild =&gt; gdbus-codegen-2.66.1-r1.ebuild} (93%)
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** syncing unity-gentoo
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>*** synced unity-gentoo
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 unity-gentoo
-</pre></td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * app-emulation/anbox-9999.2018.07.19-r10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-emulation/anbox-9999.2018.07.19-r10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * gnome-base/gnome-menus-3.0.1-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * gnome-base/gnome-menus-3.0.1-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * unity-extra/indicator-classicmenu-0.11_p_p0_p01: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * unity-extra/indicator-classicmenu-0.11_p_p0_p01: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * unity-extra/indicator-privacy-0.05: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * unity-extra/indicator-privacy-0.05: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * unity-extra/indicator-remindor-13.02: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * unity-extra/indicator-remindor-13.02: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * unity-indicators/indicator-internode-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * unity-indicators/indicator-internode-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>