Do not write userconfig in portable mode.

linkcheck/__init__.py

@@ -69,6 +69,25 @@ lognames = {
 }
 lognamelist = ", ".join(repr(name) for name in lognames)
 
+# logging configuration
+configdict = {
+    'version': 1,
+    'loggers': {
+    },
+    'root': {
+      'level': 'DEBUG',
+    },
+}
+
+def init_log_config():
+    """Configure the application loggers."""
+    for applog in lognames.values():
+        # propagate except for root app logger 'linkcheck'
+        propagate = (applog != LOG_ROOT)
+        configdict['loggers'][applog] = dict(level='INFO', propagate=propagate)
+
+init_log_config()
+
 from . import log
 
 

linkcheck/configuration/__init__.py

@@ -27,7 +27,7 @@ import urlparse
 import shutil
 import _LinkChecker_configdata as configdata
 from .. import (log, LOG_CHECK, LOG_ROOT, ansicolor, lognames, clamav,
-    get_config_dir, fileutil)
+    get_config_dir, fileutil, configdict)
 from . import confparse
 from ..decorators import memoized
 
@@ -37,8 +37,8 @@ AppName = configdata.appname
 App = AppName+u" "+Version
 Author = configdata.author
 HtmlAuthor = Author.replace(u' ', u' ')
-Copyright = u"Copyright (C) 2000-2011 "+Author
-HtmlCopyright = u"Copyright © 2000-2011 "+HtmlAuthor
+Copyright = u"Copyright (C) 2000-2012 "+Author
+HtmlCopyright = u"Copyright © 2000-2012 "+HtmlAuthor
 AppInfo = App+u"              "+Copyright
 HtmlAppInfo = App+u", "+HtmlCopyright
 Url = configdata.url
@@ -50,23 +50,7 @@ Freeware = AppName+u""" comes with ABSOLUTELY NO WARRANTY!
 This is free software, and you are welcome to redistribute it
 under certain conditions. Look at the file `LICENSE' within this
 distribution."""
-
-# logging configuration
-configdict = {
-    'version': 1,
-    'loggers': {
-    },
-    'root': {
-      'level': 'DEBUG',
-    },
-}
-
-# configure the application loggers
-for applog in lognames.values():
-    # propagate except for root app logger 'linkcheck'
-    propagate = (applog != LOG_ROOT)
-    configdict['loggers'][applog] = dict(level='INFO', propagate=propagate)
-
+Portable = configdata.portable
 
 def normpath (path):
     """Norm given system path with all available norm or expand functions
@@ -414,14 +398,17 @@ class Configuration (dict):
 
 def get_user_config():
     """Find user configuration file.
+    On portable installations, an internal example configfile is returned.
     Generate user configuration file from the example configuration
     if it does not yet exist.
-    Returns path to user config file"""
+    Returns path to user config file (which might not exist do to copy
+    failures)."""
     # example config
     exampleconf = normpath(os.path.join(get_config_dir(), "linkcheckerrc"))
     # per user config settings
     userconf = normpath("~/.linkchecker/linkcheckerrc")
-    if os.path.isfile(exampleconf) and not os.path.exists(userconf):
+    if os.path.isfile(exampleconf) and not os.path.exists(userconf) and \
+       not Portable:
         # copy the system configuration to the user configuration
         try:
             userdir = os.path.dirname(userconf)

setup.py

@@ -147,6 +147,11 @@ def get_release_date ():
     return release_date
 
 
+def get_portable():
+    """Return portable flag as string."""
+    return os.environ.get('LINKCHECKER_PORTABLE', '0')
+
+
 def get_qt_plugin_dir_win ():
     """Get Qt plugin dir on Windows systems."""
     import PyQt4
@@ -374,6 +379,7 @@ class MyDistribution (Distribution, object):
             data.append(cmd)
         data.append('appname = "LinkChecker"')
         data.append('release_date = "%s"' % get_release_date())
+        data.append('portable = %s' % get_portable())
         # write the config file
         util.execute(write_file, (filename, data),
                      "creating %s" % filename, self.verbose >= 1, self.dry_run)

windows/dist.bat

@@ -27,6 +27,9 @@ rd /s /q dist > nul
 ::goto :finish
 
 echo Building portable distribution
+set LINKCHECKER_PORTABLE=1
+rd /s /q dist > nul
+%PYDIR%\python.exe setup.py py2exe
 rd /s /q %PORTDIR% > nul
 xcopy /e /i dist %PORTDIR%
 del %PORTDIR%\omt.iss