opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22643 from qianxi0410/duplicate-isremote

Browse Source 
Remove duplicate `IsRemote`  call
This commit is contained in:
openshift-merge-bot[bot]
2024-05-30 12:47:53 +00:00
committed by GitHub
parent 939cb83a04 6c78a72995
commit 8b15ec9b29
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/podman/images/pull.go
View File

@ -122,15 +122,14 @@ func pullFlags(cmd *cobra.Command) {
if registry.IsRemote() { if registry.IsRemote() {
_ = flags.MarkHidden(decryptionKeysFlagName) _ = flags.MarkHidden(decryptionKeysFlagName)
} } else {
if !registry.IsRemote() {
certDirFlagName := "cert-dir" certDirFlagName := "cert-dir"
flags.StringVar(&pullOptions.CertDir, certDirFlagName, "", "`Pathname` of a directory containing TLS certificates and keys") flags.StringVar(&pullOptions.CertDir, certDirFlagName, "", "`Pathname` of a directory containing TLS certificates and keys")
_ = cmd.RegisterFlagCompletionFunc(certDirFlagName, completion.AutocompleteDefault) _ = cmd.RegisterFlagCompletionFunc(certDirFlagName, completion.AutocompleteDefault)
}
if !registry.IsRemote() { signaturePolicyFlagName := "signature-policy"
flags.StringVar(&pullOptions.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") flags.StringVar(&pullOptions.SignaturePolicy, signaturePolicyFlagName, "", "`Pathname` of signature policy file (not usually used)")
_ = flags.MarkHidden("signature-policy") _ = flags.MarkHidden(signaturePolicyFlagName)
} }
} }

10
cmd/podman/images/push.go
View File

@ -162,10 +162,10 @@ func pushFlags(cmd *cobra.Command) {
_ = flags.MarkHidden(signPassphraseFileFlagName) _ = flags.MarkHidden(signPassphraseFileFlagName)
_ = flags.MarkHidden(encryptionKeysFlagName) _ = flags.MarkHidden(encryptionKeysFlagName)
_ = flags.MarkHidden(encryptLayersFlagName) _ = flags.MarkHidden(encryptLayersFlagName)
} } else {
if !registry.IsRemote() { signaturePolicyFlagName := "signature-policy"
flags.StringVar(&pushOptions.SignaturePolicy, "signature-policy", "", "Path to a signature-policy file") flags.StringVar(&pushOptions.SignaturePolicy, signaturePolicyFlagName, "", "Path to a signature-policy file")
_ = flags.MarkHidden("signature-policy") _ = flags.MarkHidden(signaturePolicyFlagName)
} }
} }
@ -257,7 +257,7 @@ func imagePush(cmd *cobra.Command, args []string) error {
} }
if pushOptions.DigestFile != "" { if pushOptions.DigestFile != "" {
if err := os.WriteFile(pushOptions.DigestFile, []byte(report.ManifestDigest), 0644); err != nil { if err := os.WriteFile(pushOptions.DigestFile, []byte(report.ManifestDigest), 0o644); err != nil {
return err return err
} }
} }