- cabal-devel - Haskell.org

patch applied (hackage-server): "Switch html user list from enabled to active users" and 1 others
by devnull＠community.haskell.org 12 Feb '13

12 Feb '13

Tue Feb 12 22:10:00 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Switch html user list from enabled to active users Ignore-this: fb053d04d1f80529e1f8333923d77c76 Users accounts imported from the old hackage will be in the disabled state and we still want to list them. So now only exclude deleted users. M ./Distribution/Server/Features/Html.hs -1 +1 M ./Distribution/Server/Users/Users.hs -7 +5 Tue Feb 12 22:21:29 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Add a feature for handling legacy passwords for accounts Ignore-this: f5b7663114c0013b8ecdcee9abba60d5 Previously this feature was partly hacked into the core user and auth code which was horrible, and also unneeded for all installations other than the central hackage. So now it's a separate feature with only one hook into the user auth code. What will happen is that users who fail to authenticate but who have an old htpasswd set, will be directed to a page explaining how to upgrade. They authenticate with their old details and we generate a new digest which will then work for the rest of the site. M ./Distribution/Client/HtPasswdDb.hs -2 +4 M ./Distribution/Server/Features.hs +5 A ./Distribution/Server/Features/LegacyPasswds/ A ./Distribution/Server/Features/LegacyPasswds.hs A ./Distribution/Server/Features/LegacyPasswds/Auth.hs M ./Distribution/Server/Features/Users.hs -4 +20 M ./Distribution/Server/Framework/Auth.hs -47 +65 M ./Distribution/Server/Framework/AuthCrypt.hs -30 +1 M ./Distribution/Server/Framework/AuthTypes.hs -6 +1 M ./ImportClient.hs -3 +2 M ./hackage-server.cabal +2 A ./static/account-upgrade.html M ./static/accounts.html -2 +1

1 0

patch applied (hackage-server): "Overhaul the user account and authentication code" and 1 others
by devnull＠community.haskell.org 09 Feb '13

09 Feb '13

Sat Feb 9 05:38:30 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Overhaul the user account and authentication code Ignore-this: 92f6c35cd9beba748a53bf809113628d Remove the htpasswd feature, simplifying the UserAuth stuff so that there is now just one way to store password hashes. The legacy htpasswd stuff will be reinstated in a separate legacy password feature module. Simplify the representation of user status, we now have just enabled, disabled (with and without auth details) and deleted. This leads to simplifications in the Users db representation and operations. Also remove the silly requireName thing which automatically created historical accounts on demand, instead mirror clients will be expected to create user accounts if they want to preserve author info. M ./Distribution/Server.hs -2 +3 M ./Distribution/Server/Features/Html.hs -11 +16 M ./Distribution/Server/Features/Mirror.hs -4 +4 M ./Distribution/Server/Features/UserDetails.hs -6 +6 M ./Distribution/Server/Features/Users.hs -83 +58 M ./Distribution/Server/Framework/Auth.hs -64 +27 M ./Distribution/Server/Packages/Index.hs -4 +4 M ./Distribution/Server/Packages/Render.hs -1 +1 M ./Distribution/Server/Pages/Package.hs -2 +2 M ./Distribution/Server/Pages/Recent.hs -2 +2 M ./Distribution/Server/Users/Backup.hs -56 +38 M ./Distribution/Server/Users/State.hs -92 +39 M ./Distribution/Server/Users/Types.hs -29 +19 M ./Distribution/Server/Users/Users.hs -220 +219 Sat Feb 9 05:59:47 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Implement backup for the UserDetailsFeature Ignore-this: a028fe992021facf4c596ec1cf32c4e5 M ./Distribution/Server/Features/UserDetails.hs -15 +98

1 0

patch applied (hackage-server): "Finish backup for PreferredVersions" and 3 others
by devnull＠community.haskell.org 06 Feb '13

06 Feb '13

Wed Feb 6 10:44:22 GMT 2013 edsko(a)well-typed.com * Finish backup for PreferredVersions Ignore-this: aee7351de1a57c0da699710a288b5b31 M ./Distribution/Server/Features/PreferredVersions.hs -3 +1 M ./Distribution/Server/Features/PreferredVersions/Backup.hs -8 +80 M ./Distribution/Server/Features/PreferredVersions/State.hs +1 Wed Feb 6 12:15:47 GMT 2013 edsko(a)well-typed.com * Add explicit export lists so that unused functions are flagged Ignore-this: e7e64f73c1c1f323aa9e331951eec315 M ./BuildClient.hs -1 +1 M ./Distribution/Client.hs -1 +17 Wed Feb 6 12:44:15 GMT 2013 edsko(a)well-typed.com * Fix the 'stats' option of the build client Ignore-this: 1de003e145f0693becb75b2e7dbfacf M ./BuildClient.hs -3 +5 Wed Feb 6 16:28:42 GMT 2013 edsko(a)well-typed.com * Fix the build client Ignore-this: 71ac78ecbac11a69a2fd74784a0058c8 There were a number of orthogonal problems: 1. The documentation tarball had structure foo/index.html foo/.. which should be foo-x.y.z-docs/index.html foo-x.y.z-docs/.. 2. The build client was uploading a .tar.gz file rather than a .tar file, but didn't specify the "Content-Encoding: gzip" header 3. The "204 No Content" response by the server was interpreted as an error by the client With these fixes the build client can build documentation again. M ./BuildClient.hs -3 +3 M ./Distribution/Client.hs -6 +14 M ./Distribution/Server/Features/Documentation.hs +9

1 0

patch applied (hackage-server): "Backup candidate specific info" and 4 others
by devnull＠community.haskell.org 05 Feb '13

05 Feb '13

Tue Feb 5 09:21:44 GMT 2013 edsko(a)well-typed.com * Backup candidate specific info Ignore-this: 260636351afe9c0ba92d069ab8a15e7a M ./Distribution/Server/Features/Core/Backup.hs -8 +10 M ./Distribution/Server/Features/PackageCandidates/Backup.hs -6 +23 Tue Feb 5 10:45:42 GMT 2013 edsko(a)well-typed.com * Add consistency check to BlobStorage.open Ignore-this: 65bcc9b50acf403c655405a22fce45b1 test-backup opens a secondary store in a temporary directory (state/tmp/blobs); if this directory already exists but for some reason some subdirectories (such as state/tmp/blobs/incoming) are missing, test-backup will fail at the first call to "add". Now "open" will fail immediately with hackage-server: Store directory "state/tmp/blobs" exists but "state/tmp/blobs/incoming" does not M ./Distribution/Server/Framework/BlobStorage.hs -9 +16 Tue Feb 5 12:23:54 GMT 2013 edsko(a)well-typed.com * Finish backup for candidates Ignore-this: 72291ffe3b08494273bd17cc927a84cc M ./Distribution/Server/Features/Core/Backup.hs -1 +6 M ./Distribution/Server/Features/PackageCandidates.hs -3 +1 M ./Distribution/Server/Features/PackageCandidates/Backup.hs -2 +67 Tue Feb 5 14:37:59 GMT 2013 edsko(a)well-typed.com * Add comments to HaskellPlatform Ignore-this: 809ec3bba3041da193ce9fe69c6b02bb M ./Distribution/Server/Features/HaskellPlatform.hs -8 +23 Tue Feb 5 16:59:30 GMT 2013 edsko(a)well-typed.com * Implement export (but not yet import) for PreferredVersions Ignore-this: ab98982c80d676e0170dd12c82a54244 M ./Distribution/Server/Features/PreferredVersions.hs -16 +22 A ./Distribution/Server/Features/PreferredVersions/Backup.hs M ./hackage-server.cabal +1

1 0

patch applied (hackage-server): "Support build reports for candidates" and 6 others
by devnull＠community.haskell.org 04 Feb '13

04 Feb '13

Mon Feb 4 11:40:00 GMT 2013 edsko(a)well-typed.com * Support build reports for candidates Ignore-this: c105a4ea682efd9515c6ab9e59b14113 M ./Distribution/Server/Features.hs -2 +8 M ./Distribution/Server/Features/BuildReports.hs -27 +63 Mon Feb 4 11:53:43 GMT 2013 edsko(a)well-typed.com * Improve comment describing PackageIndex Ignore-this: d14d75c26fcfb23dc63f1f0f3e2f85f0 M ./Distribution/Server/Packages/PackageIndex.hs -2 +3 Mon Feb 4 12:44:38 GMT 2013 edsko(a)well-typed.com * Replace illegible code by legible code Ignore-this: 6ad288a3d46a64a804ec3b21d1088ad0 (Although we might remove this code altogether) M ./Distribution/Server/Features/Core/Backup.hs -10 +2 Mon Feb 4 15:15:33 GMT 2013 edsko(a)well-typed.com * Remove weird ordering of data and upload times during backup Ignore-this: 2060d62dba81ddc665405f20a7f20bb1 Little worried about this, because I don't know what the reason for it was in the first place. But Duncan says it's ok.. :) M ./Distribution/Server/Features/Core/Backup.hs -21 +2 Mon Feb 4 15:16:36 GMT 2013 edsko(a)well-typed.com * Add comments/descriptions to Mirror Ignore-this: 676d22ad0f994dc196e792a92807be0b M ./Distribution/Server/Features/Mirror.hs -12 +27 Mon Feb 4 16:42:01 GMT 2013 edsko(a)well-typed.com * Remove obsolete field from CandPkgInfo Ignore-this: 723aa8492f22333f6b3b6be74e2a9945 M ./Distribution/Server/Features/PackageCandidates.hs -1 M ./Distribution/Server/Features/PackageCandidates/Types.hs -6 +5 Mon Feb 4 16:55:23 GMT 2013 edsko(a)well-typed.com * Start work on backup for candidates Ignore-this: f5ee8328ef96cebc0576105510f19010 We reuse the Core backup to store all packages; we just need to store the additional info we have for packages. M ./Distribution/Server/Features/PackageCandidates.hs -1 +2 A ./Distribution/Server/Features/PackageCandidates/Backup.hs M ./hackage-server.cabal +1

1 0

patch applied (hackage-server): "Tidy up the user authorisation code" and 2 others
by devnull＠community.haskell.org 01 Feb '13

01 Feb '13

Fri Feb 1 21:09:55 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Tidy up the user authorisation code Ignore-this: 81f003c21c2edf3ad563faf5a86ec004 Instead of authorisation functions that take user groups by value, take them by reference which reduces the code at call sites considerably. Also extend the options for priviledge checking: allow multiple alternatives (e.g. either maintainer or trustee) and allow checks against particular user ids. This is clearer (and faster) than merging multiple groups and passing them by value. Finally, add convenience functions in the UserFeature so we don't have to call queryGetUserDb at every call site. Old: users <- queryGetUserDb pkgms <- queryState maintainersState (GetPackageMaintainers pkgname) trustee <- queryState trusteesState GetTrusteesList _ <- guardAuthorised hackageRealm users (Group.union trustee pkgms) New: guardAuthorised_ [InGroup (maintainerGroup pkgname), InGroup trusteeGroup] M ./Distribution/Server.hs -2 +3 M ./Distribution/Server/Features.hs +2 M ./Distribution/Server/Features/BuildReports.hs -15 +13 M ./Distribution/Server/Features/Documentation.hs -1 +1 M ./Distribution/Server/Features/Html.hs -7 +6 M ./Distribution/Server/Features/Mirror.hs -10 +4 M ./Distribution/Server/Features/PackageCandidates.hs -4 +4 M ./Distribution/Server/Features/PreferredVersions.hs -3 +3 M ./Distribution/Server/Features/Tags.hs -6 +7 M ./Distribution/Server/Features/Upload.hs -31 +22 M ./Distribution/Server/Features/Users.hs -59 +48 M ./Distribution/Server/Framework.hs -1 +1 M ./Distribution/Server/Framework/Auth.hs -10 +27 Fri Feb 1 21:15:08 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Add some framework support for Aeson and Text types Ignore-this: ce22d992495c260e09c4c241c58d37e1 We should use Text more generally, rather than String. And similarly, we should switch from the json package to aeson. It's faster and has better generic support. M ./Distribution/Server/Framework/MemSize.hs +5 M ./Distribution/Server/Framework/RequestContentTypes.hs -6 +15 M ./Distribution/Server/Framework/ResponseContentTypes.hs +5 M ./hackage-server.cabal -4 +7 Fri Feb 1 21:18:51 GMT 2013 Duncan Coutts <duncan(a)well-typed.com> * Add a feature to store and manage extra info about user accounts Ignore-this: d97feb7ba0ba4a03a7370da3f396e38d In particular the real name for human users, and contact email addresses. To help admins, distinguish real human user accounts from ones for bots etc and store private notes for the admins. Extend the import client to set this info from the old hackage info. A ./Distribution/Client/UserAddressesDb.hs M ./Distribution/Server/Features.hs +7 M ./Distribution/Server/Features/Html.hs -8 +14 A ./Distribution/Server/Features/UserDetails.hs M ./ImportClient.hs -14 +58

1 0

patch applied (hackage-server): "We now have support for candidate documentation"
by devnull＠community.haskell.org 01 Feb '13

01 Feb '13

Fri Feb 1 12:32:16 GMT 2013 edsko(a)well-typed.com * We now have support for candidate documentation Ignore-this: ca23e3e17e2929b5d5f0b40f71f35483 M ./Distribution/Server/Features.hs -4 +11 M ./Distribution/Server/Features/Documentation.hs -16 +31 M ./Distribution/Server/Features/Html.hs -14 +22

1 0

patch applied (hackage-server): "PackageCandidates now implements the full CoreResource" and 2 others
by devnull＠community.haskell.org 01 Feb '13

01 Feb '13

Fri Feb 1 09:45:28 GMT 2013 edsko(a)well-typed.com * PackageCandidates now implements the full CoreResource Ignore-this: 2fb05eb2b31ed883273b0ba3c810eb6 This means that with a bit of luck we should now be able to use documentation and build reports with candidates. Also got rid of the last withXXX from Candidates. M ./Distribution/Server/Features/PackageCandidates.hs -32 +25 Fri Feb 1 10:26:30 GMT 2013 edsko(a)well-typed.com * Remove withXXX from Users Ignore-this: 1906c4ebe7b6f5172ce761807c2225fa M ./Distribution/Server/Features/Html.hs -66 +66 M ./Distribution/Server/Features/Mirror.hs -5 +5 M ./Distribution/Server/Features/Users.hs -137 +121 Fri Feb 1 11:16:39 GMT 2013 edsko(a)well-typed.com * Remove obsolete stuff from CoreResource Ignore-this: b4c5b1f0b49d4a738559148fa1973552 Candidates now finally implements the entire CoreResoruce API M ./Distribution/Server/Features/Core.hs -13 +8 M ./Distribution/Server/Features/Html.hs -9 +9 M ./Distribution/Server/Features/PackageCandidates.hs -13 +7

1 0

patch applied (hackage-server): "Start cleanup of PackageCandidates (1/N)" and 1 others
by devnull＠community.haskell.org 31 Jan '13

31 Jan '13

Thu Jan 31 16:13:23 GMT 2013 edsko(a)well-typed.com * Start cleanup of PackageCandidates (1/N) Ignore-this: 9603f6b9d7e569c61dfd2f9bb40bc887 Remove redundant arguments from the withXXX functions, to make their purpose clearer. Next up: bring in line with core. M ./Distribution/Server/Features/Html.hs -4 +4 M ./Distribution/Server/Features/PackageCandidates.hs -16 +15 Thu Jan 31 17:22:48 GMT 2013 edsko(a)well-typed.com * Further cleanup of PackageCandidates Ignore-this: 479e70c64995fce07686dd453010bfdf Almost there; only internal use of a withXXX function left. Committing now because running out of time. M ./Distribution/Server/Features/Html.hs -45 +45 M ./Distribution/Server/Features/PackageCandidates.hs -63 +76

1 0

patch applied (hackage-server): "Fix Restore monad" and 15 others
by devnull＠community.haskell.org 31 Jan '13

31 Jan '13

Thu Jan 24 09:46:43 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Fix Restore monad Ignore-this: d64b04545adb4af8c80b75c67f8c88ff The presence of an explicit RestoreBind constructor meant that the monad laws were violated. M ./Distribution/Server/Framework/BackupRestore.hs -23 +56 Thu Jan 24 10:04:01 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Remove getStateSize from StateComponent Ignore-this: fd113eddc80e2c866cdbe495b2669850 (We can define it once and for all in AbstractStateComponent) M ./Distribution/Server/Features/BuildReports.hs -1 M ./Distribution/Server/Features/Core.hs -1 M ./Distribution/Server/Features/Distro.hs -1 M ./Distribution/Server/Features/Documentation.hs -1 M ./Distribution/Server/Features/DownloadCount.hs -1 M ./Distribution/Server/Features/HaskellPlatform.hs -1 M ./Distribution/Server/Features/Mirror.hs -1 M ./Distribution/Server/Features/PackageCandidates.hs -1 M ./Distribution/Server/Features/PreferredVersions.hs -1 M ./Distribution/Server/Features/Tags.hs -1 M ./Distribution/Server/Features/TarIndexCache.hs -9 +5 M ./Distribution/Server/Features/Upload.hs -3 M ./Distribution/Server/Features/Users.hs -2 M ./Distribution/Server/Framework/Feature.hs -5 +5 Tue Jan 29 13:00:25 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Disentangle htmlFeature (1/N) Ignore-this: 96e266f4cc4f60137ec4e253cf6427ae M ./Distribution/Server/Features/Html.hs -19 +35 Tue Jan 29 14:57:45 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Disentangle htmlFeature (2/N) Ignore-this: 8acaf1b3887228308320996c59d1696a This splits htmlFeature into components for each feature, but so far have made no effort to actually *reduce* the dependencies between these various parts. M ./Distribution/Server/Features/Html.hs -322 +482 Tue Jan 29 15:24:07 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Disentangle htmlFeature (3/N) Ignore-this: d1fae7bb76774b074eb078a560d3e324 Make dependencies more explicit (don't use {..}) M ./Distribution/Server/Features/Html.hs -18 +57 Tue Jan 29 16:35:41 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Disentangle htmlFeature (4/N) Ignore-this: 2db8b7b27a1d0e85e7e2a603af893457 Make the overlap between features more evident M ./Distribution/Server/Features/Html.hs -42 +51 Tue Jan 29 17:27:27 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Start having PackageCandidates implement the CoreFeature interface Ignore-this: deaf61445bf67c6aecf0c63c322fa588 The purpose is that features such as BuildReports or Documentation can then be instantiated by both Core and PackageCandidates. M ./Distribution/Server/Features/Core.hs -4 +4 M ./Distribution/Server/Features/Html.hs -7 +6 M ./Distribution/Server/Features/PackageCandidates.hs -42 +64 Wed Jan 30 09:43:00 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Use "/.." instead of "*" in ServerIntrospect Ignore-this: ac10101fcc3d3007da939d9e23d57221 This brings it inline with what we actually use in the code. M ./Distribution/Server/Features/ServerIntrospect.hs -2 +2 Wed Jan 30 09:52:53 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Document the documentation feature Ignore-this: afc7ae265cdf219e3e2b1a5c74f3e040 M ./Distribution/Server/Features/Documentation.hs -7 +12 Wed Jan 30 12:41:25 GMT 2013 Edsko de Vries <edsko(a)well-typed.com> * Core cleanup (1/N) Ignore-this: 6a82aa13b3a3ce8e3a95e6172725dd7f Core had withPackageId :: DynamicPath -> (PackageId -> ServerPartE a) -> ServerPartE a withPackageName :: MonadIO m => DynamicPath -> (PackageName -> ServerPartT m a) -> ServerPartT m a But both of these are an instance of a much more general function withPackageInPath :: (MonadPlus m, FromReqURI a) => DynamicPath -> (a -> m b) -> m b So I have removed the first two in favour of the withPackageInPath. Moreover, withPackageInPath belongs in CoreResource more than in CoreFeature -- it doesn't access the package database, but simply extracts a bit from a URL. CoreFeature still contains a whole plethora of withXXX functions; the logical place for these is indeed in Feature rather than Resource, but we don't need quite all the different combinations; we can offer more general functions. Will do that next. The immediate reason for all this cleanup is that we want the PackageCandidates feature to ultimately implement the core API so that other packages (build reports, documentation, tags, mirror, versions, ..?) can work with either. M ./Distribution/Server/Features/Core.hs -3 +6 M ./Distribution/Server/Features/Distro.hs -2 +4 M ./Distribution/Server/Features/Documentation.hs -2 +2 M ./Distribution/Server/Features/Html.hs -26 +22 M ./Distribution/Server/Features/Mirror.hs -4 +12 M ./Distribution/Server/Features/PackageCandidates.hs -5 +10 M ./Distribution/Server/Features/PreferredVersions.hs -3 +12 M ./hackage-server.cabal +1 Thu Jan 31 09:07:44 GMT 2013 edsko(a)well-typed.com * Start removing unnecessary withXXX style Ignore-this: 398ce12fc151ed4e646efeb5bbdfb741 Since these functions don't do any resource management, and live in a MonadPlus anyway, there is no need for withXXX style which just adds clutter. M ./Distribution/Server/Features/Core.hs -2 +4 M ./Distribution/Server/Features/Distro.hs -3 +3 M ./Distribution/Server/Features/Html.hs -77 +75 M ./Distribution/Server/Features/Mirror.hs -32 +32 M ./Distribution/Server/Features/PackageCandidates.hs -21 +24 M ./Distribution/Server/Features/PreferredVersions.hs -4 +4 M ./hackage-server.cabal -1 +1 Thu Jan 31 13:23:48 GMT 2013 edsko(a)well-typed.com * Further cleanup of Core Ignore-this: 1562fbab4220ee28f3381fdee1437d9a Core had this whole plethora of functions: withPackage :: PackageId -> (PkgInfo -> [PkgInfo] -> ServerPartE a) -> ServerPartE a withPackagePath :: DynamicPath -> (PkgInfo -> [PkgInfo] -> ServerPartE a) -> ServerPartE a withPackageAll :: PackageName -> ([PkgInfo] -> ServerPartE a) -> ServerPartE a withPackageAllPath :: DynamicPath -> (PackageName -> [PkgInfo] -> ServerPartE a) -> ServerPartE a withPackageVersion :: PackageId -> (PkgInfo -> ServerPartE a) -> ServerPartE a withPackageVersionPath :: DynamicPath -> (PkgInfo -> ServerPartE a) -> ServerPartE a withPackageTarball :: DynamicPath -> (PackageId -> ServerPartE a) -> ServerPartE a The withXXX style of these functions is unnecessary; it's unclear what precisely these functions do, the names don't make it obvious; and there are too many combinations. In a previous we paved the way for addressing the third concern by introducing packageInPath :: (MonadPlus m, FromReqURI a) => DynamicPath -> m a We now added packageTarballInPath :: MonadPlus m => DynamicPath -> m PackageId replacing withPackageTarball (although it still feels a little adhoc). The other 6 functions have been replaced with two: lookupPackageName :: PackageName -> ServerPartE [PkgInfo] lookupPackageId :: PackageId -> ServerPartE PkgInfo The first finds all versions of a package, while the second finds a specific version of a package, or the most recent if the version in the given identifier is empty. The purpose of both functions should hopefully be evident from their name, and obviously we got rid of the withXXX style. TRANSITION withPackage withPackage returned all packages with the given name, and the most recent version of that package if the version of the package id was Version [] [] or the specific version otherwise. This function was never called directly, but only through withPackagePath. withPackagePath This is a combination of withPackage and withPackageId, which is now packageInPath: BEFORE AFTER withPackagePath dpath $ \_ pkgs -> pkgs <- packageInPath dpath >>= lookupPackage . pkgName withPackagePath dpath $ \pkg _ -> pkg <- packageInPath dpath >>= lookupPackageId (It was only used in one of these two ways, with one argument always ignored, and the first form occurred only once.) withPackageAll This is now lookupPackageName. (Although it was often called like BEFORE AFTER withPackageAll pkgname $ \_ -> _ <- lookupPackageName pkgname We might want to replace that with something like checkPackageExists. withPackageAllPath This used withPackageName (now packageInPath) and returned the package name as well as the packages themselves. BEFORE AFTER withPackageAllPath dpath $ \pkgname pkgs pkgname <- packageInPath dpath pkgs <- lookupPackageName pkgname withPackageAllPath dpath $ \pkgname _ -> pkgname <- packageInPath dpath _ <- lookupPackageName pkgname The second form occurred surprisingly often; I've marked these calls to lookupPackageName as "TODO: Necessary?" because it wasn't obvious to me if (all) of these calls were really required, or whether it was just a "default" option to use withPackageAllPath rather than (what used to be) withPackageName. withPackageVersion This is like lookupPackageId, but explicitly ruled out empty versions. BEFORE AFTER withPackageVersion pkgid $ \pkg -> guard (pkgVersion pkgid /= Version [] []) pkg <- lookupPackageId pkgid (This occurred only once.) withPackageVersionPath Combination of withPackageId (now packageInPath) and withPackageVersion, which was *only* used in the BuildReports module. BEFORE AFTER withPackageVersionPath dpath $ \pkg -> pkgid <- packageInPath dpath guard (pkgVersion pkgid /= Version [] []) pkg <- lookupPackageId pkgid Although the latter is a bit more verbose, it's also a bit more explicit about what's happening, and in many cases the original code contained a subsequent line let pkgid = pkgInfoId pkg anyway (in which case the 'pkg' itself was ignored; I've left in the calls to lookupPackageId regardless, as a check that the package does in fact exist. I'm not 100% all of these are necessary.) M ./Distribution/Server/Features/BuildReports.hs -38 +45 M ./Distribution/Server/Features/Core.hs -83 +57 M ./Distribution/Server/Features/Documentation.hs -26 +27 M ./Distribution/Server/Features/Html.hs -54 +54 M ./Distribution/Server/Features/Mirror.hs -39 +42 M ./Distribution/Server/Features/PackageCandidates.hs -5 +4 M ./Distribution/Server/Features/PackageContents.hs -3 +7 M ./Distribution/Server/Features/PreferredVersions.hs -25 +27 M ./Distribution/Server/Features/Tags.hs -14 +17 Thu Jan 31 15:23:31 GMT 2013 edsko(a)well-typed.com * Add guardValidPackageXXX Ignore-this: ba9516f019aed244dfd06e4c7c4624d8 In our relentness quest to bring Core and Candidates closer together, add guardValidPackageId and guardValidPackageName to CoreResource. Many features just need to check if a package ID is valid, rather than get access to the actual package (BuildReports being one example). This means that these features can easily work with either Core or Candidates (which, after all, use different types of packages). This also addresses the issue mentioned in the previous log, where we used the idiom _ <- lookupPackageXXX to check that a package exists. M ./Distribution/Server/Features.hs -2 +2 M ./Distribution/Server/Features/BuildReports.hs -24 +13 M ./Distribution/Server/Features/Core.hs -1 +12 M ./Distribution/Server/Features/Html.hs -6 +4 M ./Distribution/Server/Features/PreferredVersions.hs -7 +9 M ./Distribution/Server/Features/Tags.hs -2 +2 Thu Jan 31 15:32:04 GMT 2013 edsko(a)well-typed.com * Remove withXXX from BuildReports Ignore-this: bd91f01277dffdde57ef3623dd7bf87d .. while we were here anyway .. M ./Distribution/Server/Features/BuildReports.hs -40 +38 Thu Jan 31 15:45:49 GMT 2013 edsko(a)well-typed.com * Remove withXXX style from Upload Ignore-this: 691782ddc84077e053242ff5ec121bec In preparation for cleaning up Candidates, still. M ./Distribution/Server/Features/Documentation.hs -12 +12 M ./Distribution/Server/Features/Html.hs -20 +18 M ./Distribution/Server/Features/PackageCandidates.hs -4 +4 M ./Distribution/Server/Features/PreferredVersions.hs -52 +52 M ./Distribution/Server/Features/Upload.hs -29 +30 Thu Jan 31 15:50:14 GMT 2013 edsko(a)well-typed.com * Documentation now relies on CoreResource only Ignore-this: 9377ef7f88fc721963161d8eddb0d3d0 This means that BuildReports and Documentation should now (in principle) be able to work with Core as well as Candidates. M ./Distribution/Server/Features.hs -1 +1 M ./Distribution/Server/Features/Documentation.hs -9 +7

1 0