paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-08 15:39:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: Invalid URL on update, reported by @lainz.

Browse Source 
git-svn-id: trunk@53630 -
This commit is contained in:
balazs 2016-12-10 18:42:13 +00:00
parent 67bdb598d1
commit fe67ead20d
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/onlinepackagemanager/opkman_downloader.pas
View File

@ -566,7 +566,8 @@ begin
except except
on E: Exception do on E: Exception do
begin begin
if UpperCase(E.Message) <> UpperCase('Operation aborted') then if (UpperCase(E.Message) <> UpperCase('Operation aborted')) and
(UpperCase(E.Message) <> UpperCase('Chunk to big')) then
AErrMsg := E.Message; AErrMsg := E.Message;
end; end;
end; end;

1
components/onlinepackagemanager/opkman_packagelistfrm.pas
View File

@ -166,6 +166,7 @@ begin
begin begin
Inc(ChkCnt); Inc(ChkCnt);
if (Trim(SerializablePackages.Items[I].DownloadURL) = '') or if (Trim(SerializablePackages.Items[I].DownloadURL) = '') or
(Trim(SerializablePackages.Items[I].DownloadZipURL) = '') or
(SerializablePackages.GetPackageInstallState(SerializablePackages.Items[I]) = 0) then (SerializablePackages.GetPackageInstallState(SerializablePackages.Items[I]) = 0) then
begin begin
Inc(InvCnt); Inc(InvCnt);

4
components/onlinepackagemanager/opkman_progressfrm.pas
View File

@ -266,6 +266,7 @@ end;
procedure TProgressFrm.DoOnPackageDownloadCompleted(Sender: TObject); procedure TProgressFrm.DoOnPackageDownloadCompleted(Sender: TObject);
begin begin
bCancel.Enabled := False;
FCanClose := True; FCanClose := True;
FSuccess := True; FSuccess := True;
Close; Close;
@ -327,6 +328,7 @@ end;
procedure TProgressFrm.DoOnZipCompleted(Sender: TObject); procedure TProgressFrm.DoOnZipCompleted(Sender: TObject);
begin begin
bCancel.Enabled := False;
FCanClose := True; FCanClose := True;
FSuccess := True; FSuccess := True;
Close; Close;
@ -430,6 +432,7 @@ end;
procedure TProgressFrm.DoOnPackageInstallCompleted(Sender: TObject; ANeedToRebuild: Boolean; AInstallStatus: TInstallStatus); procedure TProgressFrm.DoOnPackageInstallCompleted(Sender: TObject; ANeedToRebuild: Boolean; AInstallStatus: TInstallStatus);
begin begin
bCancel.Enabled := False;
FCanClose := True; FCanClose := True;
FSuccess := True; FSuccess := True;
FNeedToRebuild := ANeedToRebuild; FNeedToRebuild := ANeedToRebuild;
@ -467,6 +470,7 @@ var
Data: PData; Data: PData;
Node: PVirtualNode; Node: PVirtualNode;
begin begin
bCancel.Enabled := False;
if AUSuccess then if AUSuccess then
begin begin
Node := FVST.AddChild(nil); Node := FVST.AddChild(nil);

2
components/onlinepackagemanager/opkman_updates.pas
View File

@ -242,7 +242,7 @@ begin
if Package <> nil then if Package <> nil then
begin begin
HasUpdate := False; HasUpdate := False;
Package.DownloadZipURL := FXML.GetValue(Path + '/DownloadZipURL', ''); Package.DownloadZipURL := FXML.GetValue(Path + 'DownloadZipURL', '');
PackageFileCount := FXML.GetValue(Path + 'Count', 0); PackageFileCount := FXML.GetValue(Path + 'Count', 0);
for J := 0 to PackageFileCount - 1 do for J := 0 to PackageFileCount - 1 do
begin begin