diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-03 00:35:21 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-03 00:35:21 +0000 |
| commit | b1c10f425da25428c3cf92e288632cc4e605f215 (patch) | |
| tree | 98efef76939f007759310d8db8e7dc00eb41dbb3 /gentoo.html | |
| parent | 2020-12-03T00:00:01Z (diff) | |
| download | repos-b1c10f425da25428c3cf92e288632cc4e605f215.tar.gz repos-b1c10f425da25428c3cf92e288632cc4e605f215.tar.bz2 repos-b1c10f425da25428c3cf92e288632cc4e605f215.zip | |
2020-12-03T00:30:01Z
Diffstat (limited to 'gentoo.html')
| -rw-r--r-- | gentoo.html | 132 |
1 files changed, 30 insertions, 102 deletions
diff --git a/gentoo.html b/gentoo.html index 2b7377c917a0..ad00e3a4ae1b 100644 --- a/gentoo.html +++ b/gentoo.html @@ -38,137 +38,65 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo </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>WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </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>warning: Pulling without specifying how to reconcile divergent branches is </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>discouraged. You can squelch this message by running one of the following </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>commands sometime before your next pull: </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> </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.rebase false # merge (the default strategy) </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> git config pull.rebase true # rebase </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> git config pull.ff only # fast-forward only </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> </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>You can replace "git config" with "git config --global" to set a default </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>preference for all repositories. You can also pass --rebase, --no-rebase, </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>or --ff-only on the command line to override the configured default per </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>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 494811685a2..0a7b9937e6b master -> origin/master + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating 494811685a2..0a7b9937e6b + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 0a7b9937e6b..da4038c33b2 master -> origin/master </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>Updating 0a7b9937e6b..da4038c33b2 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> app-crypt/ssss/ssss-0.5.6.ebuild | 2 +- + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-editors/nano/nano-5.3-r1.ebuild | 2 +- + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../libxml2-2.9.8-python3-unicode-errors.patch | 34 ++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> app-editors/pluma/pluma-1.24.1.ebuild | 2 +- + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> ...2-2.9.10-r3.ebuild => libxml2-2.9.10-r4.ebuild} | 3 ++ </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> app-misc/lirc/lirc-0.10.1-r4.ebuild | 2 +- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> 2 files changed, 37 insertions(+) </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> app-misc/solaar/solaar-1.0.2.ebuild | 2 +- + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> create mode 100644 dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> app-vim/pydoc/pydoc-2.0-r2.ebuild | 2 +- + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> rename dev-libs/libxml2/{libxml2-2.9.10-r3.ebuild => libxml2-2.9.10-r4.ebuild} (98%) </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-java/dnsjava/dnsjava-2.1.8.ebuild | 4 +- + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing gentoo </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild | 2 +- + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced gentoo </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-libs/volume_key/volume_key-0.3.12-r1.ebuild | 2 +- + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-libs/weston/weston-9.0.0.ebuild | 4 +- + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild | 2 +- + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild | 2 +- + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-lua/luaposix/luaposix-35.0-r100.ebuild | 70 ++++++++++++++++++++++ -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> dev-lua/luaposix/luaposix-35.0.ebuild | 4 +- -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> dev-ml/findlib/findlib-1.8.1-r1.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> dev-python/configobj/Manifest | 1 - -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> dev-python/configobj/configobj-5.0.6-r1.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> dev-python/configobj/configobj-5.0.6.ebuild | 33 ---------- -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> dev-python/configobj/metadata.xml | 1 + -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> dev-python/flask-cors/flask-cors-3.0.9.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> dev-python/nose2/Manifest | 1 + -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> dev-python/nose2/nose2-0.9.2.ebuild | 41 +++++++++++++ -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> dev-python/numpy/numpy-1.19.3.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> dev-python/pygame/pygame-2.0.0.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> .../python-ironicclient-4.4.0.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> media-libs/a52dec/a52dec-0.7.4-r8.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> media-sound/jack2/jack2-1.9.16.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> media-sound/mumble/mumble-1.3.3.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> media-sound/murmur/murmur-1.3.3.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> media-sound/qtractor/qtractor-0.9.18.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> media-tv/w_scan/w_scan-20170107.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> net-misc/ofono/ofono-1.31.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> profiles/package.mask | 1 + -</pre></td></tr> - <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> sys-cluster/placement/placement-4.0.0.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> sys-cluster/sanlock/sanlock-3.8.2.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> sys-devel/bison/bison-3.7.3.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> x11-misc/mozo/mozo-1.24.0-r1.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> x11-misc/xsnow/xsnow-3.0.7.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> 38 files changed, 148 insertions(+), 68 deletions(-) -</pre></td></tr> - <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> create mode 100644 dev-lua/luaposix/luaposix-35.0-r100.ebuild -</pre></td></tr> - <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> delete mode 100644 dev-python/configobj/configobj-5.0.6.ebuild -</pre></td></tr> - <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> create mode 100644 dev-python/nose2/nose2-0.9.2.ebuild -</pre></td></tr> - <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>*** syncing gentoo -</pre></td></tr> - <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>*** synced gentoo -</pre></td></tr> - <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo -</pre></td></tr> - <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |