public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/
Date: Thu, 13 Jun 2013 16:34:28 +0000 (UTC)	[thread overview]
Message-ID: <1370455442.7e66abd0a28b088f3a657f483b1ed091b5d9a938.dywi@gentoo> (raw)
Message-ID: <20130613163428.F-5JCrZorELddrb3qAHisH-ig5khKzGHpbOy5U8P_m0@z> (raw)

commit:     7e66abd0a28b088f3a657f483b1ed091b5d9a938
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun  5 18:04:02 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun  5 18:04:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7e66abd0

roverlay/main: --fixup-category-move[-reverse]

---
 roverlay/argutil.py | 30 ++++++++++++++++++++++++++++--
 roverlay/main.py    |  5 +++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 689fe78..90d95df 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -88,7 +88,9 @@ def get_parser ( command_map, default_config_file, default_command='create' ):
       ),
       add_help=True,
       formatter_class=argparse.RawDescriptionHelpFormatter,
-      )
+   )
+
+   incremental_mutex = parser.add_mutually_exclusive_group()
 
    arg     = parser.add_argument
    opt_in  = dict ( default=False, action='store_true' )
@@ -223,6 +225,28 @@ def get_parser ( command_map, default_config_file, default_command='create' ):
       action='store_true',
    )
 
+   incremental_mutex.add_argument (
+      '--fixup-category-move',
+      help='''
+         remove packages from the default category
+         if they exist in another one
+      ''',
+      dest='fixup_category_move',
+      default=None,
+      action='store_true'
+   )
+
+   incremental_mutex.add_argument (
+      '--fixup-category-move-reverse',
+      help='''
+         remove packages from other categories if they exist in the
+         default one
+      ''',
+      default=None,
+      dest='fixup_category_move_rev',
+      action='store_true'
+   )
+
    arg (
       '--stats',
       help="print some stats",
@@ -288,7 +312,7 @@ def get_parser ( command_map, default_config_file, default_command='create' ):
    # --no-incremental currently means that an existing overlay won't be
    # scanned for ebuilds (which means that ebuilds will be recreated),
    # but old ebuilds won't be explicitly removed
-   arg (
+   incremental_mutex.add_argument (
       '--no-incremental',
       help="start overlay creation from scratch (ignore an existing overlay)",
       dest='incremental',
@@ -365,6 +389,8 @@ def parse_argv ( command_map, **kw ):
       incremental             = p.incremental,
       immediate_ebuild_writes = p.immediate_ebuild_writes,
       dump_file               = p.dump_file,
+      fixup_category_move     = p.fixup_category_move,
+      fixup_category_move_rev = p.fixup_category_move_rev,
    )
 
    if given ( 'overlay' ):

diff --git a/roverlay/main.py b/roverlay/main.py
index ab75099..a0ca8e4 100644
--- a/roverlay/main.py
+++ b/roverlay/main.py
@@ -272,6 +272,11 @@ def main (
 
          overlay_creator.release_package_rules()
 
+         if OPTION ( 'fixup_category_move' ):
+            overlay_creator.remove_moved_ebuilds ( reverse=False )
+         elif OPTION ( 'fixup_category_move_rev' ):
+            overlay_creator.remove_moved_ebuilds ( reverse=True )
+
          overlay_creator.run ( close_when_done=True )
 
          optionally ( overlay_creator.write_overlay, 'write_overlay' )


             reply	other threads:[~2013-06-13 16:35 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-05 18:08 André Erdmann [this message]
2013-06-13 16:34 ` [gentoo-commits] proj/R_overlay:master commit in: roverlay/ André Erdmann
  -- strict thread matches above, loose matches on Subject: below --
2013-07-23  7:51 André Erdmann
2013-07-23  7:51 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-23  7:51 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-19 18:00 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-19 18:00 André Erdmann
2013-07-17 18:05 André Erdmann
2013-07-15 22:31 André Erdmann
2013-07-12 13:57 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-12 13:57 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-08 22:47 André Erdmann
2013-07-08 22:47 André Erdmann
2013-07-05 16:55 André Erdmann
2013-07-05 16:55 André Erdmann
2013-07-05 16:55 André Erdmann
2013-06-22 15:24 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-22 15:14 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-22 15:24 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-22 15:14 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-22 15:24 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-20 23:40 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-22 15:24 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-20 23:40 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-19 18:58 André Erdmann
2013-06-19 18:58 André Erdmann
2013-06-05 18:08 André Erdmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370455442.7e66abd0a28b088f3a657f483b1ed091b5d9a938.dywi@gentoo \
    --to=dywi@mailerd.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox