FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

error while updating single files fixed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3385 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mfr69bs 2013-07-04 20:15:54 +00:00
parent 8dac7b6e77
commit 2a8254b47e
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -54,6 +54,7 @@
- bugfix: fixing not-working FHEM restart, when a PRESENCE check is running - bugfix: fixing not-working FHEM restart, when a PRESENCE check is running
- bugfix: fixing memory overflow when "list" a PRESENCE definition - bugfix: fixing memory overflow when "list" a PRESENCE definition
- bugfix: fixing dead PRESENCE definitions in case of timeouts - bugfix: fixing dead PRESENCE definitions in case of timeouts
- bugfix: update: error while updating single files fixed. (M. Fischer)
- 2013-04-08 (5.4) - 2013-04-08 (5.4)
- feature: updatefhem will be silently converted to update - feature: updatefhem will be silently converted to update

15
fhem/FHEM/98_update.pm
View File

@ -40,7 +40,7 @@ sub update_GetRemoteFiles($$$$);
sub update_ListChanges($$$); sub update_ListChanges($$$);
sub update_MakeDirectory($); sub update_MakeDirectory($);
sub update_ParseControlFile($$$$); sub update_ParseControlFile($$$$);
sub update_WriteLocalControlFile($$$$); sub update_WriteLocalControlFile($$$$$);
######################################## ########################################
@ -451,13 +451,13 @@ update_DoUpdate(@)
my $getUpdates; my $getUpdates;
($fail,$getUpdates) = update_GetRemoteFiles($BRANCH,$url,$updateFiles_ref,$cl); ($fail,$getUpdates) = update_GetRemoteFiles($BRANCH,$url,$updateFiles_ref,$cl);
$ret .= $getUpdates if($getUpdates); $ret .= $getUpdates if($getUpdates);
undef($updateFiles_ref);
foreach my $pack (@packages) { foreach my $pack (@packages) {
# write local controlfile # write local controlfile
my $localControlFile = update_WriteLocalControlFile($BRANCH,$pack,$lControl_ref,$rControl_ref); my $localControlFile = update_WriteLocalControlFile($BRANCH,$pack,$lControl_ref,$rControl_ref,$updateFiles_ref);
$ret .= $localControlFile if ($localControlFile); $ret .= $localControlFile if ($localControlFile);
} }
undef($updateFiles_ref);
return $ret if($fail); return $ret if($fail);
if (uc($update) eq "FHEM" || $BRANCH eq "THIRDPARTY") { if (uc($update) eq "FHEM" || $BRANCH eq "THIRDPARTY") {
@ -987,9 +987,9 @@ update_CheckFhemRelease($$$)
######################################## ########################################
sub sub
update_WriteLocalControlFile($$$$) update_WriteLocalControlFile($$$$$)
{ {
my ($BRANCH,$pack,$lControl_ref,$rControl_ref) = @_; my ($BRANCH,$pack,$lControl_ref,$rControl_ref,$updateFiles_ref) = @_;
my $modpath = (-d "updatefhem.dir" ? "updatefhem.dir":$attr{global}{modpath}); my $modpath = (-d "updatefhem.dir" ? "updatefhem.dir":$attr{global}{modpath});
my $moddir = "$modpath/FHEM"; my $moddir = "$modpath/FHEM";
my $controlsTxt; my $controlsTxt;
@ -1002,6 +1002,8 @@ update_WriteLocalControlFile($$$$)
Log 5, "update write $moddir/$controlsTxt"; Log 5, "update write $moddir/$controlsTxt";
my %rControl = %$rControl_ref; my %rControl = %$rControl_ref;
my %lControl = %$lControl_ref; my %lControl = %$lControl_ref;
my %updFiles = %$updateFiles_ref;
foreach my $f (sort keys %{$rControl{$pack}}) { foreach my $f (sort keys %{$rControl{$pack}}) {
my $ctrl = $rControl{$pack}{$f}{ctrl} if (defined($rControl{$pack}{$f}{ctrl})); my $ctrl = $rControl{$pack}{$f}{ctrl} if (defined($rControl{$pack}{$f}{ctrl}));
my $date = $rControl{$pack}{$f}{date} if (defined($rControl{$pack}{$f}{date})); my $date = $rControl{$pack}{$f}{date} if (defined($rControl{$pack}{$f}{date}));
@ -1010,7 +1012,8 @@ update_WriteLocalControlFile($$$$)
my $move = $rControl{$pack}{$f}{move} if (defined($rControl{$pack}{$f}{move})); my $move = $rControl{$pack}{$f}{move} if (defined($rControl{$pack}{$f}{move}));
if ($ctrl eq "UPD") { if ($ctrl eq "UPD") {
if (defined($lControl{$pack}{$f}{ctrl}) && $lControl{$pack}{$f}{ctrl} eq "EXC") { if (defined($lControl{$pack}{$f}{ctrl}) &&
($lControl{$pack}{$f}{ctrl} eq "EXC" || !exists $updFiles{$f})) {
$date = defined($lControl{$pack}{$f}{date}) ? $lControl{$pack}{$f}{date} : $date = defined($lControl{$pack}{$f}{date}) ? $lControl{$pack}{$f}{date} :
$rControl{$pack}{$f}{date}; $rControl{$pack}{$f}{date};
$size = defined($lControl{$pack}{$f}{size}) ? $lControl{$pack}{$f}{size} : $size = defined($lControl{$pack}{$f}{size}) ? $lControl{$pack}{$f}{size} :

10
fhem/MAINTAINER.txt
View File

@ -41,11 +41,11 @@ FHEM/10_FRM.pm ntruchsess http://forum.fhem.de Sonstiges
FHEM/10_FS20.pm rudolfkoenig http://forum.fhem.de SlowRF FHEM/10_FS20.pm rudolfkoenig http://forum.fhem.de SlowRF
FHEM/10_IT.pm odroegehorn http://forum.fhem.de InterTechno FHEM/10_IT.pm odroegehorn http://forum.fhem.de InterTechno
FHEM/10_MAX.pm mgehre http://forum.fhem.de MAX FHEM/10_MAX.pm mgehre http://forum.fhem.de MAX
FHEM/10_OWServer.pm borisneubert http://forum.fhem.de 1Wire FHEM/10_OWServer.pm borisneubert/mfr69bs http://forum.fhem.de 1Wire
FHEM/10_ZWave.pm rudolfkoenig http://forum.fhem.de ZWave FHEM/10_ZWave.pm rudolfkoenig http://forum.fhem.de ZWave
FHEM/11_FHT.pm rudolfkoenig http://forum.fhem.de SlowRF FHEM/11_FHT.pm rudolfkoenig http://forum.fhem.de SlowRF
FHEM/11_FHT8V.pm rudolfkoenig http://forum.fhem.de SlowRF FHEM/11_FHT8V.pm rudolfkoenig http://forum.fhem.de SlowRF
FHEM/11_OWDevice.pm borisneubert http://forum.fhem.de 1Wire FHEM/11_OWDevice.pm borisneubert/mfr69bs http://forum.fhem.de 1Wire
FHEM/12_HMS.pm rudolfkoenig http://forum.fhem.de SlowRF FHEM/12_HMS.pm rudolfkoenig http://forum.fhem.de SlowRF
FHEM/13_KS300.pm rudolfkoenig http://forum.fhem.de SlowRF FHEM/13_KS300.pm rudolfkoenig http://forum.fhem.de SlowRF
FHEM/14_CUL_MAX.pm mgehre http://forum.fhem.de MAX FHEM/14_CUL_MAX.pm mgehre http://forum.fhem.de MAX
@ -62,7 +62,7 @@ FHEM/20_FRM_LCD.pm ntruchsess http://forum.fhem.de Sonstiges
FHEM/20_FRM_OUT.pm ntruchsess http://forum.fhem.de Sonstiges FHEM/20_FRM_OUT.pm ntruchsess http://forum.fhem.de Sonstiges
FHEM/20_FRM_PWM.pm ntruchsess http://forum.fhem.de Sonstiges FHEM/20_FRM_PWM.pm ntruchsess http://forum.fhem.de Sonstiges
FHEM/20_FRM_SERVO.pm ntruchsess http://forum.fhem.de Sonstiges FHEM/20_FRM_SERVO.pm ntruchsess http://forum.fhem.de Sonstiges
FHEM/20_OWFS.pm mfr69b http://forum.fhem.de 1Wire (deprecated) FHEM/20_OWFS.pm mfr69bs http://forum.fhem.de 1Wire (deprecated)
FHEM/20_X10.pm borisneubert http://forum.fhem.de SlowRF FHEM/20_X10.pm borisneubert http://forum.fhem.de SlowRF
FHEM/21_OWAD.pm pahenning http://forum.fhem.de 1Wire FHEM/21_OWAD.pm pahenning http://forum.fhem.de 1Wire
FHEM/21_OWCOUNT.pm pahenning http://forum.fhem.de 1Wire FHEM/21_OWCOUNT.pm pahenning http://forum.fhem.de 1Wire
@ -70,7 +70,7 @@ FHEM/21_OWID.pm pahenning http://forum.fhem.de 1Wire
FHEM/21_OWLCD.pm pahenning http://forum.fhem.de 1Wire FHEM/21_OWLCD.pm pahenning http://forum.fhem.de 1Wire
FHEM/21_OWMULTI.pm pahenning http://forum.fhem.de 1Wire FHEM/21_OWMULTI.pm pahenning http://forum.fhem.de 1Wire
FHEM/21_OWSWITCH.pm pahenning http://forum.fhem.de 1Wire FHEM/21_OWSWITCH.pm pahenning http://forum.fhem.de 1Wire
FHEM/21_OWTEMP.pm mfr69b http://forum.fhem.de 1Wire FHEM/21_OWTEMP.pm mfr69bs http://forum.fhem.de 1Wire (deprecated)
FHEM/21_OWTHERM.pm pahenning http://forum.fhem.de 1Wire FHEM/21_OWTHERM.pm pahenning http://forum.fhem.de 1Wire
FHEM/22_ALL3076.pm sachag http://forum.fhem.de Snstiges FHEM/22_ALL3076.pm sachag http://forum.fhem.de Snstiges
FHEM/23_ALL4027.pm sachag http://forum.fhem.de Sonstiges FHEM/23_ALL4027.pm sachag http://forum.fhem.de Sonstiges
@ -147,7 +147,7 @@ FHEM/95_remotecontrol.pm ulimaass http://forum.fhem.de Frontends
FHEM/98_CULflash.pm rudolfkoenig http://forum.fhem.de Sonstiges FHEM/98_CULflash.pm rudolfkoenig http://forum.fhem.de Sonstiges
FHEM/98_HMinfo.pm martinp876 http://forum.fhem.de Sonstiges FHEM/98_HMinfo.pm martinp876 http://forum.fhem.de Sonstiges
FHEM/98_Heating_Control.pm dietmar63 http://forum.fhem.de Unterstützende Dienste FHEM/98_Heating_Control.pm dietmar63 http://forum.fhem.de Unterstützende Dienste
FHEM/98_JsonList.pm mfr69b http://forum.fhem.de Automatisierung FHEM/98_JsonList.pm mfr69bs http://forum.fhem.de Automatisierung
FHEM/98_PID.pm rudolfkoenig http://forum.fhem.de Automatisierung FHEM/98_PID.pm rudolfkoenig http://forum.fhem.de Automatisierung
FHEM/98_SVG.pm rudolfkoenig http://forum.fhem.de Frontends FHEM/98_SVG.pm rudolfkoenig http://forum.fhem.de Frontends
FHEM/98_THRESHOLD.pm damian-s http://forum.fhem.de Automatisierung FHEM/98_THRESHOLD.pm damian-s http://forum.fhem.de Automatisierung