IDE: package manager: AddProjectDependency: return mrOk if already exists

git-svn-id: trunk@22113 -
This commit is contained in:
mattias 2009-10-12 11:54:55 +00:00
parent 61806eef87
commit 9db44686b6
2 changed files with 4 additions and 2 deletions

View File

@ -92,6 +92,8 @@ type
procedure AddDefaultDependencies(AProject: TProject); virtual; abstract; procedure AddDefaultDependencies(AProject: TProject); virtual; abstract;
function AddProjectDependency(AProject: TProject; APackage: TLazPackage; function AddProjectDependency(AProject: TProject; APackage: TLazPackage;
OnlyTestIfPossible: boolean = false): TModalResult; virtual; abstract; OnlyTestIfPossible: boolean = false): TModalResult; virtual; abstract;
function AddProjectDependency(AProject: TProject;
ADependency: TPkgDependency): TModalResult; virtual; abstract;
procedure AddProjectRegCompDependency(AProject: TProject; procedure AddProjectRegCompDependency(AProject: TProject;
ARegisteredComponent: TRegisteredComponent); virtual; abstract; ARegisteredComponent: TRegisteredComponent); virtual; abstract;
procedure AddProjectLCLDependency(AProject: TProject); virtual; abstract; procedure AddProjectLCLDependency(AProject: TProject); virtual; abstract;

View File

@ -243,7 +243,7 @@ type
function AddProjectDependency(AProject: TProject; APackage: TLazPackage; function AddProjectDependency(AProject: TProject; APackage: TLazPackage;
OnlyTestIfPossible: boolean = false): TModalResult; override; OnlyTestIfPossible: boolean = false): TModalResult; override;
function AddProjectDependency(AProject: TProject; function AddProjectDependency(AProject: TProject;
ADependency: TPkgDependency): TModalResult; ADependency: TPkgDependency): TModalResult; override;
procedure AddProjectRegCompDependency(AProject: TProject; procedure AddProjectRegCompDependency(AProject: TProject;
ARegisteredComponent: TRegisteredComponent); override; ARegisteredComponent: TRegisteredComponent); override;
procedure AddProjectLCLDependency(AProject: TProject); override; procedure AddProjectLCLDependency(AProject: TProject); override;
@ -2158,7 +2158,7 @@ begin
APackage.Name)<>nil APackage.Name)<>nil
then begin then begin
// package already there // package already there
Result:=mrCancel; Result:=mrOk;
exit; exit;
end; end;
ProvidingAPackage:=PackageGraph.FindPackageProvidingName( ProvidingAPackage:=PackageGraph.FindPackageProvidingName(