Browse Source

* PackageLocalArchive should always return a filename, to avoid hanlding directories as being archives

git-svn-id: trunk@32732 -
joost 9 years ago
parent
commit
51a216f5ca
1 changed files with 10 additions and 1 deletions
  1. 10 1
      packages/fppkg/src/pkghandler.pp

+ 10 - 1
packages/fppkg/src/pkghandler.pp

@@ -159,13 +159,22 @@ end;
 
 
 function PackageLocalArchive(APackage:TFPPackage): String;
+var
+  S: String;
 begin
   if APackage.Name=CurrentDirPackageName then
     Error(SErrNoPackageSpecified)
   else if APackage.Name=CmdLinePackageName then
     Result:=APackage.LocalFileName
   else
-    Result:=GlobalOptions.ArchivesDir+APackage.FileName;
+    begin
+      S:=APackage.FileName;
+      if S='' then
+        begin
+          S:=ChangeFileExt(APackage.Name,'.zip');
+        end;
+      Result:=GlobalOptions.ArchivesDir+S;
+    end;
 end;