git://git.camperquake.de
/
videosite.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b0b6b32
)
videosite-irssi: set/check version marker in config_init
author
Ralf Ertzinger
<ralf@skytale.net>
Tue, 30 Apr 2013 14:32:25 +0000
(16:32 +0200)
committer
Ralf Ertzinger
<ralf@skytale.net>
Tue, 30 Apr 2013 14:32:25 +0000
(16:32 +0200)
videosite-irssi.pl
patch
|
blob
|
history
diff --git
a/videosite-irssi.pl
b/videosite-irssi.pl
index
f20e3a1
..
dc6196b
100644
(file)
--- a/
videosite-irssi.pl
+++ b/
videosite-irssi.pl
@@
-778,7
+778,12
@@
sub config_init {
my $conf;
# Check for irssi internal config. If not found...
my $conf;
# Check for irssi internal config. If not found...
+ if (config_has(['config-version'])) {
+ # Configuration in irssi config file. We're done.
+ return;
+ }
+ # Try to find old config files and load them.
if (-r $conffile) {
write_debug("Attempting JSON config load from %s", $conffile);
eval {
if (-r $conffile) {
write_debug("Attempting JSON config load from %s", $conffile);
eval {
@@
-855,6
+860,7
@@
sub config_init {
}
config_set(['active-connectors'], join(",", @{$conf->{connectorlist}}));
config_set(['defined-connectors'], join(",", @connectors));
}
config_set(['active-connectors'], join(",", @{$conf->{connectorlist}}));
config_set(['defined-connectors'], join(",", @connectors));
+ config_set(['config-version'], '2');
}
#
}
#