xmltv/grab/na_dd tv_grab_na_dd.in,1.83,1.84

Update of /cvsroot/xmltv/xmltv/grab/na_dd
In directory vz-cvs-3.sog:/tmp/cvs-serv21895

Modified Files:
	tv_grab_na_dd.in 
Log Message:
fix --auto-config

Index: tv_grab_na_dd.in
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/na_dd/tv_grab_na_dd.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** tv_grab_na_dd.in	30 Dec 2011 22:49:05 -0000	1.83
--- tv_grab_na_dd.in	24 Sep 2012 04:37:54 -0000	1.84
***************
*** 617,621 ****
      }
      $dd_pass='' if $dd_pass eq 'x';
! }
  
  die "*ERROR* Username not specified. Please run --configure\n" unless $dd_user;
--- 617,621 ----
      }
      $dd_pass='' if $dd_pass eq 'x';
! } #configure mode
  
  die "*ERROR* Username not specified. Please run --configure\n" unless $dd_user;
***************
*** 1093,1097 ****
              }
          }
!     }
      else  # There was no default for new channels, so we ask the user
      {
--- 1093,1097 ----
              }
          }
!     } # auto config
      else  # There was no default for new channels, so we ask the user
      {
***************
*** 1117,1133 ****
              $i++;
          }
!     } # --auto-config during configure
  
- #
- # ask about auto-config for the config file
- #
-     my $config_autoconfig=0;
-     if (ask_boolean("Lineups change periodically. The default for new stations is to notify you.\n".
-                     "Do you want new stations to be automatically added?")) {
-        $config_autoconfig="add";
-     }
-     elsif (ask_boolean("Do you want new stations to be ignored?")) {
-        $config_autoconfig="ignore";
-     }
     
  #
--- 1117,1133 ----
              $i++;
          }
!         #
!         # ask about auto-config for the config file
!         #
!             $opt_auto_config=0;
!             if (ask_boolean("Lineups change periodically. The default for new stations is to notify you.\n".
!                             "Do you want new stations to be automatically added?")) {
!                $opt_auto_config="add";
!             }
!             elsif (ask_boolean("Do you want new stations to be ignored?")) {
!                $opt_auto_config="ignore";
!             }
!         } # no --auto-config during configure
  
     
  #
***************
*** 1139,1143 ****
      print CONF "timeoffset: $opt_tz_offset\n";
      print CONF "lineup:   $dd_lineup\n";
!     print CONF "auto-config: $config_autoconfig\n" if $config_autoconfig;
  
      foreach (@{$lineups{$dd_lineup}{map}})
--- 1139,1143 ----
      print CONF "timeoffset: $opt_tz_offset\n";
      print CONF "lineup:   $dd_lineup\n";
!     print CONF "auto-config: $opt_auto_config\n" if $opt_auto_config;
  
      foreach (@{$lineups{$dd_lineup}{map}})


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/