Skip to content

Commit

Permalink
fix: v3 -> v2
Browse files Browse the repository at this point in the history 
retargeting code to v2 instead of master branch
  • Loading branch information
@cderici
cderici committed Jun 5, 2024
1 parent b78a77b commit 0c78f8b
Show file tree
Hide file tree
Showing 27 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion commands/apt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package commands

import "github.com/juju/packaging/v3/config"
import "github.com/juju/packaging/v2/config"

// Constants for apt-based basic commands
const (
Expand Down
2 changes: 1 addition & 1 deletion commands/apt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/juju/proxy"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
)

var _ = gc.Suite(&AptSuite{})
Expand Down
2 changes: 1 addition & 1 deletion commands/snap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/proxy"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
)

var _ = gc.Suite(&SnapSuite{})
Expand Down
2 changes: 1 addition & 1 deletion commands/yum_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/juju/proxy"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
)

var _ = gc.Suite(&YumSuite{})
Expand Down
2 changes: 1 addition & 1 deletion commands/zypper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/juju/proxy"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
)

var _ = gc.Suite(&ZypperSuite{})
Expand Down
2 changes: 1 addition & 1 deletion config/apt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/config"
"github.com/juju/packaging/v2/config"
)

var _ = gc.Suite(&AptSuite{})
Expand Down
2 changes: 1 addition & 1 deletion config/configurer_apt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package config

import (
"github.com/juju/packaging/v3"
"github.com/juju/packaging/v2"
)

// aptConfigurer is the PackagingConfigurer implementation for apt-based systems.
Expand Down
2 changes: 1 addition & 1 deletion config/configurer_yum.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package config

import (
"github.com/juju/packaging/v3"
"github.com/juju/packaging/v2"
)

// yumConfigurer is the PackagingConfigurer implementation for apt-based systems.
Expand Down
2 changes: 1 addition & 1 deletion config/configurer_zypper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package config

import (
"github.com/juju/packaging/v3"
"github.com/juju/packaging/v2"
)

// yumConfigurer is the PackagingConfigurer implementation for apt-based systems.
Expand Down
2 changes: 1 addition & 1 deletion config/constants_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package config_test

import "github.com/juju/packaging/v3"
import "github.com/juju/packaging/v2"

var (
testedSource = packaging.PackageSource{
Expand Down
2 changes: 1 addition & 1 deletion config/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package config

import (
"github.com/juju/packaging/v3"
"github.com/juju/packaging/v2"
)

// PackagingConfigurer is an interface which handles various packaging-related configuration
Expand Down
2 changes: 1 addition & 1 deletion config/interface_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package config_test

import (
"github.com/juju/packaging/v3/config"
"github.com/juju/packaging/v2/config"
)

var _ config.PackagingConfigurer = config.NewAptPackagingConfigurer()
Expand Down
2 changes: 1 addition & 1 deletion config/yum_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/config"
"github.com/juju/packaging/v2/config"
)

var _ = gc.Suite(&YumSuite{})
Expand Down
2 changes: 1 addition & 1 deletion config/zypper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/config"
"github.com/juju/packaging/v2/config"
)

var _ = gc.Suite(&ZypperSuite{})
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/juju/packaging/v3
module github.com/juju/packaging/v2

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion manager/apt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"

"github.com/juju/errors"
"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
"github.com/juju/proxy"
)

Expand Down
4 changes: 2 additions & 2 deletions manager/apt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v2/commands"
"github.com/juju/packaging/v2/manager"
)

var _ = gc.Suite(&AptSuite{})
Expand Down
2 changes: 1 addition & 1 deletion manager/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/juju/proxy"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
)

// basePackageManager is the struct which executes various
Expand Down
4 changes: 2 additions & 2 deletions manager/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v2/commands"
"github.com/juju/packaging/v2/manager"
)

var _ = gc.Suite(&ManagerSuite{})
Expand Down
2 changes: 1 addition & 1 deletion manager/run_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/juju/testing"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v2/manager"
)

var _ = gc.Suite(&RunSuite{})
Expand Down
2 changes: 1 addition & 1 deletion manager/snap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/juju/errors"
"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
"github.com/juju/proxy"
)

Expand Down
4 changes: 2 additions & 2 deletions manager/snap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v2/commands"
"github.com/juju/packaging/v2/manager"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions manager/testing/interface_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package testing_test

import (
"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v3/manager/testing"
"github.com/juju/packaging/v2/manager"
"github.com/juju/packaging/v2/manager/testing"
)

var _ manager.PackageManager = &testing.MockPackageManager{}
2 changes: 1 addition & 1 deletion manager/yum.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os/exec"
"strings"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
"github.com/juju/proxy"
)

Expand Down
4 changes: 2 additions & 2 deletions manager/yum_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v2/commands"
"github.com/juju/packaging/v2/manager"
)

var _ = gc.Suite(&YumSuite{})
Expand Down
2 changes: 1 addition & 1 deletion manager/zypper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"regexp"
"strings"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v2/commands"
"github.com/juju/proxy"
)

Expand Down
4 changes: 2 additions & 2 deletions manager/zypper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/packaging/v3/commands"
"github.com/juju/packaging/v3/manager"
"github.com/juju/packaging/v2/commands"
"github.com/juju/packaging/v2/manager"
)

var _ = gc.Suite(&ZypperSuite{})
Expand Down

0 comments on commit 0c78f8b

Please sign in to comment.