Skip to content

Commit 0209655

Browse files
utzigutzig
committed
FIXUP: testing
1 parent affb566 commit 0209655

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
lines changed

‎newt/cli/project_cmds.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ func makeRepoPredicate(repoNames []string) func(r *repo.Repo) bool {
121121
}
122122

123123
func upgradeRunCmd(cmd *cobra.Command, args []string) {
124-
proj := TryGetOrDownloadProject(args)
124+
proj := TryGetOrDownloadProject(newtutil.NewtNoDeps, args)
125125
interfaces.SetProject(proj)
126126

127-
proj.GetPkgRepos(args)
127+
proj.GetPkgRepos(newtutil.NewtNoDeps, args)
128128

129129
pred := makeRepoPredicate(args)
130130
if err := proj.UpgradeIf(

‎newt/cli/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ func TryGetProject() *project.Project {
210210
return p
211211
}
212212

213-
func TryGetOrDownloadProject(okRepos []string) *project.Project {
213+
func TryGetOrDownloadProject(noDeps bool, okRepos []string) *project.Project {
214214
var p *project.Project
215215
var err error
216216

217-
if p, err = project.TryGetOrDownloadProject(okRepos); err != nil {
217+
if p, err = project.TryGetOrDownloadProject(noDeps, okRepos); err != nil {
218218
NewtUsage(nil, err)
219219
}
220220

‎newt/deprepo/deprepo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func BuildDepGraph(repos RepoMap, rootReqs RequirementMap, noDeps bool) (DepGrap
140140
// Add inter-repo dependencies to the graph.
141141
for _, r := range repos.Sorted() {
142142
nvers, err := r.NormalizedVersions()
143-
if err != nil && noDeps && isInReqs(r.Name(), rootReqs) {
143+
if err != nil && !noDeps && isInReqs(r.Name(), rootReqs) {
144144
return nil, err
145145
}
146146
for _, v := range nvers {

‎newt/project/project.go

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ type Project struct {
8585
yc ycfg.YCfg
8686
}
8787

88-
func initProject(dir string, download bool, okRepos []string) error {
88+
func initProject(dir string, download bool, noDeps bool, okRepos []string) error {
8989
var err error
9090

91-
globalProject, err = loadProject(dir, download, okRepos)
91+
globalProject, err = loadProject(dir, download, noDeps, okRepos)
9292
if err != nil {
9393
return err
9494
}
@@ -99,29 +99,29 @@ func initProject(dir string, download bool, okRepos []string) error {
9999
return nil
100100
}
101101

102-
func initialize(download bool, okRepos []string) error {
102+
func initialize(download bool, noDeps bool, okRepos []string) error {
103103
if globalProject == nil {
104104
wd, err := os.Getwd()
105105
wd = filepath.ToSlash(wd)
106106
if err != nil {
107107
return util.NewNewtError(err.Error())
108108
}
109-
if err := initProject(wd, download, okRepos); err != nil {
109+
if err := initProject(wd, download, noDeps, okRepos); err != nil {
110110
return err
111111
}
112112
}
113113
return nil
114114
}
115115

116116
func TryGetProject() (*Project, error) {
117-
if err := initialize(false, nil); err != nil {
117+
if err := initialize(false, false, nil); err != nil {
118118
return nil, err
119119
}
120120
return globalProject, nil
121121
}
122122

123-
func TryGetOrDownloadProject(okRepos []string) (*Project, error) {
124-
if err := initialize(true, okRepos); err != nil {
123+
func TryGetOrDownloadProject(noDeps bool, okRepos []string) (*Project, error) {
124+
if err := initialize(true, noDeps, okRepos); err != nil {
125125
return nil, err
126126
}
127127
return globalProject, nil
@@ -153,10 +153,10 @@ func ResetDeps(newList interfaces.PackageList) interfaces.PackageList {
153153
return oldList
154154
}
155155

156-
func newProject(dir string, download bool, okRepos []string) (*Project, error) {
156+
func newProject(dir string, download bool, noDeps bool, okRepos []string) (*Project, error) {
157157
proj := &Project{}
158158

159-
if err := proj.Init(dir, download, okRepos); err != nil {
159+
if err := proj.Init(dir, download, noDeps, okRepos); err != nil {
160160
return nil, err
161161
}
162162

@@ -175,14 +175,14 @@ func isOkRepo(repo string, okRepos []string) bool {
175175
return false
176176
}
177177

178-
func (proj *Project) GetPkgRepos(okRepos []string) error {
178+
func (proj *Project) GetPkgRepos(noDeps bool, okRepos []string) error {
179179

180180
for _, pkgList := range proj.packages {
181181
for _, pkg := range *pkgList {
182182
if pkg.PkgConfig().HasKey("repository") {
183183
for k, _ := range pkg.PkgConfig().AllSettings() {
184184
repoName := strings.TrimPrefix(k, "repository.")
185-
if repoName != k && isOkRepo(repoName, okRepos) {
185+
if repoName != k && (!noDeps || isOkRepo(repoName, okRepos)) {
186186
fields, err := pkg.PkgConfig().GetValStringMapString(k, nil)
187187
util.OneTimeWarningError(err)
188188

@@ -318,7 +318,7 @@ func (proj *Project) UpgradeIf(
318318
predicate func(r *repo.Repo) bool) error {
319319

320320
// Make sure we have an up to date copy of all `repository.yml` files.
321-
if err := proj.downloadRepositoryYmlFiles(okRepos); err != nil {
321+
if err := proj.downloadRepositoryYmlFiles(noDeps, okRepos); err != nil {
322322
return err
323323
}
324324

@@ -341,7 +341,7 @@ func (proj *Project) InfoIf(predicate func(r *repo.Repo) bool,
341341

342342
if remote {
343343
// Make sure we have an up to date copy of all `repository.yml` files.
344-
if err := proj.downloadRepositoryYmlFiles(nil); err != nil {
344+
if err := proj.downloadRepositoryYmlFiles(false, nil); err != nil {
345345
return err
346346
}
347347
}
@@ -438,7 +438,7 @@ func (proj *Project) checkNewtVer() error {
438438
}
439439

440440
// Loads the `repository.yml` file for each depended-on repo. This
441-
func (proj *Project) loadRepoDeps(download bool, okRepos []string) error {
441+
func (proj *Project) loadRepoDeps(download bool, noDeps bool, okRepos []string) error {
442442
seen := map[string]struct{}{}
443443

444444
loadDeps := func(r *repo.Repo) ([]*repo.Repo, error) {
@@ -447,7 +447,7 @@ func (proj *Project) loadRepoDeps(download bool, okRepos []string) error {
447447
depMap := r.CommitDepMap()
448448
for _, depSlice := range depMap {
449449
for _, dep := range depSlice {
450-
if !isOkRepo(dep.Name, okRepos) {
450+
if !isOkRepo(dep.Name, okRepos) && noDeps {
451451
log.Debugf("Skipping repo %s", dep.Name)
452452
continue
453453
}
@@ -503,7 +503,8 @@ func (proj *Project) loadRepoDeps(download bool, okRepos []string) error {
503503
return nil
504504
}
505505

506-
func (proj *Project) downloadRepositoryYmlFiles(okRepos []string) error {
506+
func (proj *Project) downloadRepositoryYmlFiles(noDeps bool,
507+
okRepos []string) error {
507508
// Download the `repository.yml` file for each root-level repo (those
508509
// specified in the `project.yml` file).
509510
for _, r := range proj.repos.Sorted() {
@@ -518,7 +519,7 @@ func (proj *Project) downloadRepositoryYmlFiles(okRepos []string) error {
518519
}
519520

520521
// Download the `repository.yml` file for each depended-on repo.
521-
if err := proj.loadRepoDeps(true, okRepos); err != nil {
522+
if err := proj.loadRepoDeps(true, noDeps, okRepos); err != nil {
522523
return err
523524
}
524525

@@ -584,7 +585,7 @@ func (proj *Project) addRepo(r *repo.Repo, download bool, isDep bool) error {
584585
return nil
585586
}
586587

587-
func (proj *Project) loadConfig(download bool, okRepos []string) error {
588+
func (proj *Project) loadConfig(download bool, noDeps bool, okRepos []string) error {
588589
yc, err := config.ReadFile(proj.BasePath + "/" + PROJECT_FILE_NAME)
589590
if err != nil {
590591
return util.NewNewtError(err.Error())
@@ -643,7 +644,7 @@ func (proj *Project) loadConfig(download bool, okRepos []string) error {
643644
// Read `repository.yml` files belonging to dependee repos from disk.
644645
// These repos might not be specified in the `project.yml` file, but they
645646
// are still part of the project.
646-
if err := proj.loadRepoDeps(download, okRepos); err != nil {
647+
if err := proj.loadRepoDeps(download, noDeps, okRepos); err != nil {
647648
return err
648649
}
649650

@@ -680,7 +681,7 @@ func (proj *Project) loadConfig(download bool, okRepos []string) error {
680681
return nil
681682
}
682683

683-
func (proj *Project) Init(dir string, download bool, okRepos []string) error {
684+
func (proj *Project) Init(dir string, download bool, noDeps bool, okRepos []string) error {
684685
proj.BasePath = filepath.ToSlash(filepath.Clean(dir))
685686

686687
// Only one project per system, when created, set it as the global project
@@ -690,7 +691,7 @@ func (proj *Project) Init(dir string, download bool, okRepos []string) error {
690691
proj.rootRepoReqs = map[string]newtutil.RepoVersion{}
691692

692693
// Load Project configuration
693-
if err := proj.loadConfig(download, okRepos); err != nil {
694+
if err := proj.loadConfig(download, noDeps, okRepos); err != nil {
694695
return err
695696
}
696697

@@ -831,13 +832,13 @@ func (proj *Project) PackagesOfType(pkgType interfaces.PackageType) []interfaces
831832
return matches
832833
}
833834

834-
func loadProject(dir string, download bool, okRepos []string) (*Project, error) {
835+
func loadProject(dir string, download bool, noDeps bool, okRepos []string) (*Project, error) {
835836
projDir, err := findProjectDir(dir)
836837
if err != nil {
837838
return nil, err
838839
}
839840

840-
proj, err := newProject(projDir, download, okRepos)
841+
proj, err := newProject(projDir, download, noDeps, okRepos)
841842

842843
return proj, err
843844
}

0 commit comments

Comments
 (0)