Skip to content

Commit

Permalink
bugfix: allow the syntax "hackport merge foo/bar"
Browse files Browse the repository at this point in the history
This will make the package "bar" be part of category "foo".
  • Loading branch information
kolmodin committed May 28, 2010
1 parent 8bf1f28 commit 2d91ca9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Merge.hs
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ merge verbosity repo serverURI args overlayPath = do
let cabal_pkgId = packageInfoId selectedPkg let cabal_pkgId = packageInfoId selectedPkg
norm_pkgId = Portage.normalizeCabalPackageId cabal_pkgId norm_pkgId = Portage.normalizeCabalPackageId cabal_pkgId
norm_pkgName = packageName norm_pkgId norm_pkgName = packageName norm_pkgId
cat <- Portage.resolveCategory verbosity overlay norm_pkgName cat <- maybe (Portage.resolveCategory verbosity overlay norm_pkgName) return m_category


let pkgGenericDesc = packageDescription selectedPkg let pkgGenericDesc = packageDescription selectedPkg
Right (pkgDesc0, flags) = Right (pkgDesc0, flags) =
Expand Down

0 comments on commit 2d91ca9

Please sign in to comment.