diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-01-31 18:09:08 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-01-31 18:09:08 +0000 |
| commit | 2e1d5ac4ff73ca1847bf7d1dcfa1044ea2f4a4a4 (patch) | |
| tree | 043bc3e22296c9b3494a2420d6cb9b0b7b1419a6 /bin | |
| parent | b04acdc9bdf9535ec0d6e6e755aa581127787d55 (diff) | |
| download | xxv-2e1d5ac4ff73ca1847bf7d1dcfa1044ea2f4a4a4.tar.gz xxv-2e1d5ac4ff73ca1847bf7d1dcfa1044ea2f4a4a4.tar.bz2 | |
* Update CHANGELOG
* Backport fixes to XXV-1.0.2
* Remove query of revision by svnversion (Use maximum of modul version)
* TIMERS: Drop used function getEvents
* CHANNELS: Don't redirect if deletion of channel failed
* widget/list: avoid theoretical wrong item selection
* popularity: change layout of database table for smaller memory using
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/xxvd | 32 |
1 files changed, 13 insertions, 19 deletions
@@ -40,7 +40,7 @@ use Locale::gettext; $|++; -my $REV = &getRev() || (split(/ /, '$Revision$'))[1]; +my $REV = (split(/ /, '$Revision$'))[1]; my $MODULES; my $VERSION = '1.1'; my $VDRVERSION = 0; @@ -276,7 +276,7 @@ sub init { my $moduleName = 'XXV::MODULES::'.(split('\.',(split('/', $module))[-1]))[0]; # make an object for the module - eval "use $moduleName"; + eval "use $moduleName"; error $@ if $@; my $modul = $moduleName->new( -config => $Config, @@ -284,12 +284,18 @@ sub init { -paths => $PATHS, ); - $MODULES->{$moduleName} = $modul if(ref $modul); - debug sprintf("Load modul %s(%s)", + if(ref $modul) { + $MODULES->{$moduleName} = $modul; + my $modRev = $modul->{MOD}->{Version}; + debug sprintf("Load modul %s(%s)", $moduleName, - (ref $MODULES->{$moduleName}) - ? $MODULES->{$moduleName}->{MOD}->{Version} - : 'failed'); + $modRev); + $REV = $modRev + if($modRev > $REV); + + } else { + panic sprintf("Load modul %s failed!",$moduleName); + } } &after(); @@ -433,18 +439,6 @@ sub getModule { } # ------------------ -sub getRev { -# ------------------ - my $sourcedir = $PATHS->{HTMLDIR}; - if(-d $sourcedir and -d $sourcedir.'/.svn' and `which svnversion` ne "") { - my $rev = `svnversion -n $sourcedir`; - return $rev; - } else { - return 0; - } -} - -# ------------------ sub getGeneralConfig { # ------------------ return $Config->{General}; |
