diff --git a/README.md b/README.md index 4dc2ffd..fd98ec9 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,12 @@ You can also find support via our IRC channels: `#PyLink @ irc.overdrivenetworks ## Installation +### Installing via Debian APT repository (beta; stable branch only) + +[The Utopia Repository](https://packages.overdrivenetworks.com/) hosts `.deb` packages for PyLink. For Debian Jessie (stable) and Stretch/sid (testing), the `pylink` package and its dependencies are available in the `main` section. See https://packages.overdrivenetworks.com/#instructions for setup instructions. + +Upon installing `pylink`, example configuration and docs will be in `/usr/share/doc/pylink/examples` and `/usr/share/doc/pylink/docs` respectively. You can also install a local copy of the [PyLink API reference](https://pylink.github.io/), which is provided by the `pylink-doc` package. + ### Installing from source First, make sure the following dependencies are met: diff --git a/RELNOTES.md b/RELNOTES.md index bfd74d7..0235b31 100644 --- a/RELNOTES.md +++ b/RELNOTES.md @@ -1,3 +1,20 @@ +# PyLink 1.0.2 +Tagged as **1.0.2** by [GLolol](https://github.com/GLolol) + +The "Baluga" release. + +### Changes from 1.0.1 + +#### Bug fixes +- Clientbot: Fixed nick collisions between virtual clients and real users (#327) +- Fix typo in example conf that caused `log::filerotation` to become an empty, `None`-valued block. This in turn caused the `log` module to crash. + +#### Feature changes +- Clientbot now uses a more specific realname fallback ("PyLink Relay Mirror Client") instead of potentially misleading text such as "PyLink Service Client". In the future, this text may be made configurable. + +#### Internal fixes / improvements + - setup.py: reworded warnings if `git describe --tags` fails / fallback version is used. Also, the internal VCS version for non-Git builds is now `-nogit` instead of `-dirty`. + # PyLink 1.0.1 Tagged as **1.0.1** by [GLolol](https://github.com/GLolol) diff --git a/conf.py b/conf.py index 2ae379f..7d1e213 100644 --- a/conf.py +++ b/conf.py @@ -11,6 +11,7 @@ except ImportError: raise ImportError("Please install PyYAML and try again.") import sys +import os.path from collections import defaultdict from . import world @@ -58,8 +59,10 @@ def validateConf(conf): def loadConf(filename, errors_fatal=True): """Loads a PyLink configuration file from the filename given.""" global confname, conf, fname + # Note: store globally the last loaded conf filename, for REHASH in coremods/control. fname = filename - confname = filename.split('.', 1)[0] + # For the internal config name, strip off any .yml extensions and absolute paths + confname = os.path.basename(filename).split('.', 1)[0] try: with open(filename, 'r') as f: conf = yaml.load(f) diff --git a/docs/faq.md b/docs/faq.md index e4d26e0..edbcbc9 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -2,7 +2,7 @@ ### I get errors like "ImportError: No module named 'yaml'" when I start PyLink -You are missing dependencies - re-read https://github.com/GLolol/PyLink#dependencies +You are missing dependencies - re-read https://github.com/GLolol/PyLink/blob/master/README.md#installation ### I get errors like "yaml.scanner.ScannerError: while scanning for the next token, found character '\t' that cannot start any token" diff --git a/plugins/automode.py b/plugins/automode.py index aed4f8b..17eef11 100644 --- a/plugins/automode.py +++ b/plugins/automode.py @@ -35,7 +35,7 @@ def loadDB(): with open(dbname, "r") as f: db.update(json.load(f)) except (ValueError, IOError, OSError): - log.info("Automode: failed to load links database %s; creating a new one in " + log.info("Automode: failed to load ACL database %s; creating a new one in " "memory.", dbname) def exportDB():