21 lines
984 B
Diff
21 lines
984 B
Diff
|
--- cabal-rpm-0.13.3/src/PackageUtils.hs~ 2019-05-11 15:22:29.000000000 +0800
|
||
|
+++ cabal-rpm-0.13.3/src/PackageUtils.hs 2019-09-04 18:30:50.875375095 +0800
|
||
|
@@ -42,7 +42,7 @@
|
||
|
import FileUtils (filesWithExtension, fileWithExtension,
|
||
|
getDirectoryContents_, mktempdir, withTempDirectory)
|
||
|
import Options (RpmFlags (..))
|
||
|
-import SimpleCmd (cmd, cmd_, cmdIgnoreErr, cmdLines, grep_, sudo,
|
||
|
+import SimpleCmd (cmd, cmd_, cmdIgnoreErr, cmdLines, grep_, sudo_,
|
||
|
(+-+))
|
||
|
import SimpleCmd.Git (isGitDir, grepGitConfig)
|
||
|
import SysCmd (die, optionalProgram, requireProgram, rpmEval)
|
||
|
@@ -576,7 +576,7 @@
|
||
|
pkginstaller <- packageManager
|
||
|
let (inst, arg) = if pkginstaller == "dnf" then ("dnf", "install") else ("yum", "localinstall")
|
||
|
tty <- hIsTerminalDevice stdout
|
||
|
- sudo inst $ ["-y" | not tty] ++ [arg] ++ rpms
|
||
|
+ sudo_ inst $ ["-y" | not tty] ++ [arg] ++ rpms
|
||
|
|
||
|
editSpecField :: String -> String -> FilePath -> IO ()
|
||
|
editSpecField field new spec =
|