浏览代码

* TFPPackage.GetDebugName now also works when the package is not assigned

git-svn-id: trunk@36286 -
joost 8 年之前
父节点
当前提交
2f72f67f11
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      packages/fppkg/src/fprepos.pp

+ 4 - 1
packages/fppkg/src/fprepos.pp

@@ -339,6 +339,7 @@ ResourceString
   SErrMaxLevelExceeded     = 'Maximum number of dependency levels exceeded (%d) at package "%s".';
   SErrMaxLevelExceeded     = 'Maximum number of dependency levels exceeded (%d) at package "%s".';
   SErrMirrorNotFound       = 'Mirror "%s" not found.';
   SErrMirrorNotFound       = 'Mirror "%s" not found.';
   SRepoUnknown             = 'RepositoryUnknown';
   SRepoUnknown             = 'RepositoryUnknown';
+  SPackageUnknown          = 'unknown package';
 
 
 
 
 Function MakeTargetString(CPU : TCPU;OS: TOS) : String;
 Function MakeTargetString(CPU : TCPU;OS: TOS) : String;
@@ -728,7 +729,9 @@ end;
 
 
 Function TFPPackage.GetDebugName: string;
 Function TFPPackage.GetDebugName: string;
 begin
 begin
-  if Assigned(Repository) then
+  if not Assigned(Self) then
+    Result := SPackageUnknown
+  else if Assigned(Repository) then
     Result:=Repository.RepositoryName+'-'+Name
     Result:=Repository.RepositoryName+'-'+Name
   else
   else
     Result:=SRepoUnknown+'-'+Name;
     Result:=SRepoUnknown+'-'+Name;