Changeset 38552 for branches/eam_branches/ipp-20150616/pstamp/scripts/pstampparse.pl

Timestamp:

Jun 25, 2015, 10:05:06 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150616

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (2 diffs)

branches/eam_branches/ipp-20150616/pstamp/scripts/pstampparse.pl

@@ -142 +142 @@
 
 if ($extver eq "1") {
-    print STDERR "WARNING WARNING WARNING\n";
-    print STDERR "Very soon version 1 postage stamp requests will be rejected. Please update your request tables to version 2 format.\n";
+    print STDERR "Version 1 postage stamp requests are no longer accepted. Please update your request tables to version 2 format.\n";
     print STDERR "Note that EMAIL will not be optional\n";
 
@@ -247 +246 @@
 # if any is known. Do we want to do this for any other channels?
 # requests from data store will have those values.
-if ($label and $label eq 'WEB.UP') {
+if ($label and ($label eq 'WEB.UP' or $label eq 'WEB')) {
     if ($labelForUser) {
         $label = $labelForUser;