Merged revisions 11943,11967 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
  r11943 | marco | 2008-10-22 18:30:20 +0200 (Wed, 22 Oct 2008) | 2 lines
  
   * patch from peter
........
  r11967 | marco | 2008-10-24 12:20:28 +0200 (Fri, 24 Oct 2008) | 1 line
  
   * allow disabling of mirrors.xml when a custom remoterepository is configured
........

git-svn-id: branches/fixes_2_2@12115 -

utils/fppkg/fppkg.pp

@@ -315,7 +315,7 @@ begin
 
     if ParaPackages.Count=0 then
       begin
-        ActionPackage:=InstalledRepository.AddPackage(CurrentDirPackageName);
+        ActionPackage:=AvailableRepository.AddPackage(CurrentDirPackageName);
         pkghandler.ExecuteAction(CurrentDirPackageName,ParaAction);
       end
     else
@@ -325,7 +325,7 @@ begin
           begin
             if FileExists(ParaPackages[i]) then
               begin
-                ActionPackage:=InstalledRepository.AddPackage(CmdLinePackageName);
+                ActionPackage:=AvailableRepository.AddPackage(CmdLinePackageName);
                 ActionPackage.LocalFileName:=ExpandFileName(ParaPackages[i]);
                 pkghandler.ExecuteAction(CmdLinePackageName,ParaAction);
               end

utils/fppkg/pkgcommands.pp

@@ -132,10 +132,15 @@ procedure TCommandUpdate.Execute;
 var
   PackagesURL :  String;
 begin
-  // Download mirrors.xml
-  Log(vlCommands,SLogDownloading,[GlobalOptions.RemoteMirrorsURL,GlobalOptions.LocalMirrorsFile]);
-  DownloadFile(GlobalOptions.RemoteMirrorsURL,GlobalOptions.LocalMirrorsFile);
-  LoadLocalAvailableMirrors;
+  // Download and load mirrors.xml
+  // This can be skipped when a custom RemoteRepository is configured
+  if (GlobalOptions.RemoteMirrorsURL<>'') and
+     (GlobalOptions.RemoteRepository<>'auto') then
+    begin
+      Log(vlCommands,SLogDownloading,[GlobalOptions.RemoteMirrorsURL,GlobalOptions.LocalMirrorsFile]);
+      DownloadFile(GlobalOptions.RemoteMirrorsURL,GlobalOptions.LocalMirrorsFile);
+      LoadLocalAvailableMirrors;
+    end;
   // Download packages.xml
   PackagesURL:=GetRemoteRepositoryURL(PackagesFileName);
   Log(vlCommands,SLogDownloading,[PackagesURL,GlobalOptions.LocalPackagesFile]);