Merged revisions 12456,12459 via svnmerge from

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

........
  r12456 | joost | 2008-12-30 00:07:55 +0100 (Tue, 30 Dec 2008) | 1 line
  
   * PackageAvailableVersionStr should use the AvailableRepository instead of InstalledRepository
........
  r12459 | joost | 2009-01-01 13:09:19 +0100 (Thu, 01 Jan 2009) | 1 line
  
   * Load the local mirrors before an update is tried if it is a new installation or else the update will always fail
........

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

utils/fppkg/fppkg.pp

@@ -296,6 +296,7 @@ begin
 
     MaybeCreateLocalDirs;
     LoadCompilerDefaults;
+    LoadLocalAvailableMirrors;
 
     // Load local repository, update first if this is a new installation
     // errors will only be reported as warning. The user can be bootstrapping
@@ -309,7 +310,6 @@ begin
             Log(vlWarning,E.Message);
         end;
       end;
-    LoadLocalAvailableMirrors;
     LoadLocalAvailableRepository;
     FindInstalledPackages(FPMakeCompilerOptions,true);
     CheckFPMakeDependencies;

utils/fppkg/pkgrepos.pp

@@ -457,7 +457,7 @@ function PackageAvailableVersionStr(const AName:String):string;
 var
   P : TFPPackage;
 begin
-  P:=InstalledRepository.FindPackage(AName);
+  P:=AvailableRepository.FindPackage(AName);
   if P<>nil then
     result:=P.Version.AsString
   else