Revision: 6299
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6299&view=rev
Author:   owes
Date:     2012-02-01 11:17:13 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Should be possible to do Instant Update without having the auto updater enabled.

Modified Paths:
--------------
    ipcop/trunk/src/scripts/blacklistupdate.pl

Modified: ipcop/trunk/src/scripts/blacklistupdate.pl
===================================================================
--- ipcop/trunk/src/scripts/blacklistupdate.pl  2012-02-01 11:13:34 UTC (rev 
6298)
+++ ipcop/trunk/src/scripts/blacklistupdate.pl  2012-02-01 11:17:13 UTC (rev 
6299)
@@ -49,6 +49,7 @@
 
 my $exitcode = 1;
 my $doUpdate = 0;
+my $doUpdateForce = 0;
 my $doSetPermissions = 0;
 
 if (-e "$updconffile") {
@@ -62,7 +63,7 @@
 
     if ($argument eq '--force') {
         # force/instant update
-        $doUpdate = 1;
+        $doUpdateForce = 1;
     }
     elsif ($argument eq '--red') {
         # check for update after red connect
@@ -74,6 +75,10 @@
         # set permissions on prebuild blacklist
         $doSetPermissions = 1;
     }
+    elsif ($argument eq '-v') {
+        # verbose 
+        $debugLevel++;
+    }
     else {
         # If we are here, a parameter was given to us that we do not know 
about.
 
@@ -84,7 +89,7 @@
 } # while (@ARGV)
 
 
-if($doUpdate) {
+if ($doUpdate || $doUpdateForce) {
     if ($debugLevel > 0) {
         print "Updating...\n";
         system("logger -t installpackage[urlfilter] \"URL filter blacklist - 
Updating...\"");
@@ -114,7 +119,7 @@
 
 sub updateblacklist
 {
-    if($updatesettings{'ENABLE_AUTOUPDATE'} ne 'on') {
+    if (($updatesettings{'ENABLE_AUTOUPDATE'} ne 'on') && !$doUpdateForce) {
         if ($debugLevel > 0) {
             print "Update not enabled, exit.\n";
             system("logger -t installpackage[urlfilter] \"URL filter blacklist 
- Update not enabled, exit.\"");

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to