mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Dan MacNeil (omacneil)
  frank allaby (fallaby)
Related merge proposals:
  https://code.launchpad.net/~fallaby/mvhub/remove_choose_default_from_MVHub_Utils.pm_bug537839/+merge/24922
  proposed by: frank allaby (fallaby)
------------------------------------------------------------
revno: 383 [merge]
committer: Dan MacNeil <dan@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-05-10 12:14:34 -0400
message:
  merged remove_choose_default_from_MVHub_Utils.pm_bug537839 
modified:
  app-mvhub/bin/notification_email.pl
  lib-mvhub/lib/MVHub/AuthAccount.pm
  lib-mvhub/lib/MVHub/Utils.pm


--
lp:mvhub
https://code.launchpad.net/~mvhub-commit/mvhub/trunk

Your team MVHub Developers is subscribed to branch lp:mvhub.
To unsubscribe from this branch go to https://code.launchpad.net/~mvhub-commit/mvhub/trunk/+edit-subscription

=== modified file 'app-mvhub/bin/notification_email.pl'
--- app-mvhub/bin/notification_email.pl	2010-05-04 13:34:32 +0000
+++ app-mvhub/bin/notification_email.pl	2010-05-07 18:15:42 +0000
@@ -35,10 +35,11 @@
 
 # Command Line option handling
 my $CFG_FILENAME = $ENV{MV_CONFIG_FILE};
-my $EXECUTE = 0;
-Getopt::Long::GetOptions( 'config=s' => \$CFG_FILENAME,
-						  'execute' => \$EXECUTE )
-    or die "GetOptions failed";
+my $EXECUTE      = 0;
+Getopt::Long::GetOptions(
+    'config=s' => \$CFG_FILENAME,
+    'execute'  => \$EXECUTE
+) or die "GetOptions failed";
 
 # Config File Variables
 my $CFG = MVHub::Utils::ConfigSimple::create_config_from($CFG_FILENAME);

=== modified file 'lib-mvhub/lib/MVHub/AuthAccount.pm'
--- lib-mvhub/lib/MVHub/AuthAccount.pm	2010-05-05 16:17:05 +0000
+++ lib-mvhub/lib/MVHub/AuthAccount.pm	2010-05-07 18:15:42 +0000
@@ -98,8 +98,9 @@
     my $agency_id = shift;
     my $password  = shift;
 
-    my $sql = MVHub::Utils::DB::get_sql_select_statement('AGENCY_X_AUTH_AGENCY');
-	
+    my $sql
+        = MVHub::Utils::DB::get_sql_select_statement('AGENCY_X_AUTH_AGENCY');
+
     my $rows_aref
         = $dbh->selectall_arrayref( $sql, undef, $agency_id, lc($password) );
     return ( scalar @$rows_aref == 1 );

=== modified file 'lib-mvhub/lib/MVHub/Utils.pm'
--- lib-mvhub/lib/MVHub/Utils.pm	2010-03-03 14:13:49 +0000
+++ lib-mvhub/lib/MVHub/Utils.pm	2010-05-07 17:02:45 +0000
@@ -212,13 +212,7 @@
  assert(1=2,'2 does not equal 1');
  assert(@lines, 'there are some lines');
 
-=head2 choose_default_or_custom_file($custom_dir,$default_dir,$file)
-
-If $file is in $custom_dir, return the full path to that file, otherwise if $file is in $default_dir , 
-return full path to that file. Die if $file is in neither dir.
-
- $template_file =  choose_default_or_custom_file('/etc/spamassassin/','/usr/share/spamassassin/',foo.conf)
- $template_file = choose_default_or_custom_file('/usr/share/mvhub/','/etc/mvhub/','contact.tmpl');
+
 
 =head2 clean_cgi_params($cgi)