paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-08 12:39:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: ReplacePackage: nil old package

Browse Source 
git-svn-id: trunk@51667 -
This commit is contained in:
mattias 2016-02-19 14:23:37 +00:00
parent bd1384ed17
commit 6010e8f928
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/packagesystem.pas
View File

@ -362,7 +362,7 @@ type
// packages handling // packages handling
function CreateNewPackage(const Prefix: string): TLazPackage; function CreateNewPackage(const Prefix: string): TLazPackage;
procedure AddPackage(APackage: TLazPackage); procedure AddPackage(APackage: TLazPackage);
procedure ReplacePackage(OldPackage, NewPackage: TLazPackage); procedure ReplacePackage(var OldPackage: TLazPackage; NewPackage: TLazPackage);
procedure ClosePackage(APackage: TLazPackage); procedure ClosePackage(APackage: TLazPackage);
procedure CloseUnneededPackages; procedure CloseUnneededPackages;
procedure ChangePackageID(APackage: TLazPackage; procedure ChangePackageID(APackage: TLazPackage;
@ -2071,7 +2071,8 @@ begin
EndUpdate; EndUpdate;
end; end;
procedure TLazPackageGraph.ReplacePackage(OldPackage, NewPackage: TLazPackage); procedure TLazPackageGraph.ReplacePackage(var OldPackage: TLazPackage;
NewPackage: TLazPackage);
procedure MoveInstalledComponents(OldPkgFile: TPkgFile); procedure MoveInstalledComponents(OldPkgFile: TPkgFile);
var var
@ -2118,6 +2119,7 @@ begin
MoveInstalledComponents(OldPackage.RemovedFiles[i]); MoveInstalledComponents(OldPackage.RemovedFiles[i]);
// delete old package // delete old package
Delete(fItems.IndexOf(OldPackage)); Delete(fItems.IndexOf(OldPackage));
OldPackage:=nil;
// restore flags // restore flags
NewPackage.Installed:=OldInstalled; NewPackage.Installed:=OldInstalled;
NewPackage.AutoInstall:=OldAutoInstall; NewPackage.AutoInstall:=OldAutoInstall;