* A package now always has a filename, to fix PAckageRemoteArchive

git-svn-id: trunk@32759 -

packages/fppkg/src/fprepos.pp

@@ -358,6 +358,8 @@ begin
     begin
       URI:=ParseURI(DownloadURL);
       Result:=URI.Document;
+      if Result='' then
+        Result:=ChangeFileExt(Name,'.zip');
     end
   else
     Result:=FFileName;

packages/fppkg/src/pkghandler.pp

@@ -159,22 +159,13 @@ 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
-    begin
-      S:=APackage.FileName;
-      if S='' then
-        begin
-          S:=ChangeFileExt(APackage.Name,'.zip');
-        end;
-      Result:=GlobalOptions.ArchivesDir+S;
-    end;
+    Result:=GlobalOptions.ArchivesDir+APackage.FileName;
 end;