In order to reduce time consumed for dependency checks, skip 'dev' profiles

by default and add an --include-dev option which causes them to be checked.
Given the current profiles.desc content, this approximately halves the number
of profiles checked by default and also halves the time consumed by repoman.
Thanks to Donnie Berkholz <dberkholz@g.o> for the suggestion.

svn path=/main/trunk/; revision=11962

diff --git a/bin/repoman b/bin/repoman
index a9bbe6237edc2b37934d617da8abc0d749e9a2e9..04a0fa5f9caee237f9e090e2239378e25182551a 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -193,6 +193,9 @@ def ParseArgs(args, qahelp):
        parser.add_option('-I', '--ignore-masked', dest='ignore_masked', action='store_true',
                default=False, help='ignore masked packages (not allowed with commit mode)')
 
+       parser.add_option('--include-dev', dest='include_dev', action='store_true',
+               default=False, help='include dev profiles in dependency checks')
+
        parser.add_option('--without-mask', dest='without_mask', action='store_true',
                default=False, help='behave as if no package.mask entries exist (not allowed with commit mode)')
 
@@ -1453,7 +1456,8 @@ for x in scanlist:
                                
                        for prof in profiles[arch]:
 
-                               if prof[1] not in ("stable", "dev"):
+                               if prof[1] not in ("stable", "dev") or \
+                                       prof[1] == "dev" and not options.include_dev:
                                        continue
 
                                profdir = portdir+"/profiles/"+prof[0]

diff --git a/man/repoman.1 b/man/repoman.1
index a4a92a731ceb42dc4cd4de2d88065936756409bf..ee911dd731684cc2195a2d4c00a341c77fe6c4f4 100644 (file)
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -37,6 +37,9 @@ Ignore arch-specific failures (where arch != host)
 \fB\-I\fR, \fB\-\-ignore\-masked\fR
 Ignore masked packages (not allowed with commit mode)
 .TP
+\fB\-\-include\-dev\fR
+Include dev profiles in dependency checks.
+.TP
 \fB\-\-without\-mask\fR
 Behave as if no package.mask entries exist (not allowed with commit mode)
 .TP