diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-11-15 22:30:43 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-11-15 22:30:43 +0000 |
| commit | f617f08b03894142ffaab097150c7c49d2adbde2 (patch) | |
| tree | d57254e8d79c4f414513f69711e10bf5038641d7 | |
| parent | 2c17f82eb21869ebe46ed0a110b8d1932c35d9b2 (diff) | |
| download | fpc-f617f08b03894142ffaab097150c7c49d2adbde2.tar.gz | |
Merged revisions 11943,11967 via svnmerge from
svn+ssh://marco@svn.freepascal.org/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: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@12115 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | utils/fppkg/fppkg.pp | 4 | ||||
| -rw-r--r-- | utils/fppkg/pkgcommands.pp | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/utils/fppkg/fppkg.pp b/utils/fppkg/fppkg.pp index 76759b882d..005734588b 100644 --- a/utils/fppkg/fppkg.pp +++ b/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 diff --git a/utils/fppkg/pkgcommands.pp b/utils/fppkg/pkgcommands.pp index 4bb8479749..19c618b4e5 100644 --- a/utils/fppkg/pkgcommands.pp +++ b/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]); |