diff options
author | hudson_d <hudson_d@a3e5c962-4219-0410-a828-e124f845ac39> | 2011-04-05 19:00:24 +0000 |
---|---|---|
committer | hudson_d <hudson_d@a3e5c962-4219-0410-a828-e124f845ac39> | 2011-04-05 19:00:24 +0000 |
commit | 53371c17c039062ec9d8acb41e049b0f5601c5db (patch) | |
tree | d5e44bb4e2fd0ebc2775cdc09af41a28c0d3d84f | |
parent | fc9ca9dceb9d685eb389300d11fc54f076e7d3fa (diff) | |
download | MPC-53371c17c039062ec9d8acb41e049b0f5601c5db.tar.gz |
Tue Apr 5 18:47:09 UTC 2011 Don Hudson <hudsond@ociweb.com>
* modules/WorkspaceCreator.pm:
Added default_verbose_ordering() that returns false
and used it to set verbose_ordering. This allows derived workspace
creators to override the default verbose ordering.
Fixed typo in comment.
Corrected Perl warning by replacing == with eq in an if statement.
Modified the verbose ordering warning message to include the name
of the project being processed.
* modules/Driver.pm:
Changed to set verbose ordering on the creator only if it's defined
in the config file.
* modules/RpmSpecWorkspaceCreator.pm:
Added default_verbose_ordering() that returns true so that
a warning is logged if there are missing dependencies when
generating an rpm spec file.
-rw-r--r-- | ChangeLog | 26 | ||||
-rw-r--r-- | modules/Driver.pm | 3 | ||||
-rw-r--r-- | modules/RpmSpecWorkspaceCreator.pm | 4 | ||||
-rw-r--r-- | modules/WorkspaceCreator.pm | 13 |
4 files changed, 41 insertions, 5 deletions
@@ -1,3 +1,29 @@ +Tue Apr 5 18:47:09 UTC 2011 Don Hudson <hudsond@ociweb.com> + + * modules/WorkspaceCreator.pm: + + Added default_verbose_ordering() that returns false + and used it to set verbose_ordering. This allows derived workspace + creators to override the default verbose ordering. + + Fixed typo in comment. + + Corrected Perl warning by replacing == with eq in an if statement. + + Modified the verbose ordering warning message to include the name + of the project being processed. + + * modules/Driver.pm: + + Changed to set verbose ordering on the creator only if it's defined + in the config file. + + * modules/RpmSpecWorkspaceCreator.pm: + + Added default_verbose_ordering() that returns true so that + a warning is logged if there are missing dependencies when + generating an rpm spec file. + Tue Apr 5 12:57:22 UTC 2011 Don Hudson <hudsond@ociweb.com> * docs/html/MakeProjectCreator.html: diff --git a/modules/Driver.pm b/modules/Driver.pm index b96ad603..8481793a 100644 --- a/modules/Driver.pm +++ b/modules/Driver.pm @@ -577,7 +577,8 @@ sub run { mpc_debug::chkpnt_post_creator_create($name); ## Update settings based on the configuration file - $creator->set_verbose_ordering($cfg->get_value('verbose_ordering')); + my $verbose_ordering = $cfg->get_value('verbose_ordering'); + $creator->set_verbose_ordering($verbose_ordering) if defined $verbose_ordering; if ($base ne $file) { my $dir = ($base eq '' ? $file : $self->mpc_dirname($file)); diff --git a/modules/RpmSpecWorkspaceCreator.pm b/modules/RpmSpecWorkspaceCreator.pm index 33917a4a..2db94c98 100644 --- a/modules/RpmSpecWorkspaceCreator.pm +++ b/modules/RpmSpecWorkspaceCreator.pm @@ -43,6 +43,10 @@ sub documentation_info { return '^sub get_template', '^EOT$'; } +sub default_verbose_ordering { + return 1; # Warn if there are missing dependencies. +} + # Called by document_template.pl sub interpret_keyword { my $vname = shift; diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index 4c86c091..8b1c2741 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -93,7 +93,7 @@ sub new { $self->{'for_eclipse'} = $foreclipse; $self->{'generate_dot'} = $gendot; $self->{'generate_ins'} = $genins; - $self->{'verbose_ordering'} = undef; + $self->{'verbose_ordering'} = $self->default_verbose_ordering(); $self->{'wctype'} = $self->extractType("$self"); $self->{'workspace_comments'} = $comments; @@ -183,7 +183,7 @@ sub parse_line { } else { ## Workspace Beginning - ## Deal with the inheritance hiearchy first + ## Deal with the inheritance hierarchy first if (defined $values[2]) { foreach my $parent (@{$values[2]}) { ## Read in the parent onto ourself @@ -449,7 +449,7 @@ sub process_types { ## Remove all negated types from the collection. foreach my $key (keys %types) { if ($key =~ /^!\s*(\w+)/) { - if ($1 == $self->{wctype}) { + if ($1 eq $self->{wctype}) { ## Remove the negated key delete $types{$key}; @@ -2230,7 +2230,7 @@ sub get_validated_ordering { } if (!$found) { if ($self->{'verbose_ordering'}) { - $self->warning("'$name' references '$dep' which has " . + $self->warning("processing '$project' and '$name' references '$dep' which has " . "not been processed."); } splice(@$deps, $i, 1); @@ -2432,6 +2432,11 @@ sub workspace_per_project { } +sub default_verbose_ordering { + return 0; # Don't warning if there are missing dependencies. +} + + sub pre_workspace { #my $self = shift; #my $fh = shift; |