Skip to content

Commit 42678a7

Browse files
authored
fixing build errors caused by bad cherry-pick choice (#41178)
1 parent 96380e4 commit 42678a7

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

server/mdm/apple/apple_mdm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ func (pb *ProfileBimap) add(wantedProfile, currentProfile *fleet.MDMAppleProfile
14001400
// NewActivityFunc is the function signature for creating a new activity.
14011401
type NewActivityFunc func(ctx context.Context, user *fleet.User, activity fleet.ActivityDetails) error
14021402

1403-
func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMAppleCommander, logger *platformlogging.Logger,
1403+
func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMAppleCommander, logger kitlog.Logger,
14041404
newActivityFn NewActivityFunc,
14051405
) error {
14061406
appCfg, err := ds.AppConfig(ctx)
@@ -1515,7 +1515,7 @@ func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMApp
15151515

15161516
// turnOffMDMIfAPNSFailed checks if the error is an APNSDeliveryError and turns off MDM for the failed devices.
15171517
// Returns a boolean value to indicate whether or not MDM was turned off.
1518-
func turnOffMDMIfAPNSFailed(ctx context.Context, ds fleet.Datastore, err error, logger *platformlogging.Logger, newActivityFn NewActivityFunc) (bool,
1518+
func turnOffMDMIfAPNSFailed(ctx context.Context, ds fleet.Datastore, err error, logger kitlog.Logger, newActivityFn NewActivityFunc) (bool,
15191519
error,
15201520
) {
15211521
var e *APNSDeliveryError

0 commit comments

Comments
 (0)