@@ -88,6 +88,7 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
88
88
repo = new (Repository )
89
89
has , err := sess .ID (release .RepoID ).Get (repo )
90
90
if err != nil {
91
+ log .Error ("Error whilst loading repository[%d] for release[%d] with tag name %s" , release .RepoID , release .ID , release .TagName )
91
92
return err
92
93
} else if ! has {
93
94
log .Warn ("Release[%d] is orphaned and refers to non-existing repository %d" , release .ID , release .RepoID )
@@ -99,28 +100,37 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
99
100
// v120.go migration may not have been run correctly - we'll just replicate it here
100
101
// because this appears to be a common-ish problem.
101
102
if _ , err := sess .Exec ("UPDATE repository SET owner_name = (SELECT name FROM `user` WHERE `user`.id = repository.owner_id)" ); err != nil {
103
+ log .Error ("Error whilst updating repository[%d] owner name" , repo .ID )
102
104
return err
103
105
}
104
106
105
107
if _ , err := sess .ID (release .RepoID ).Get (repo ); err != nil {
108
+ log .Error ("Error whilst loading repository[%d] for release[%d] with tag name %s" , release .RepoID , release .ID , release .TagName )
106
109
return err
107
110
}
108
111
}
109
112
gitRepo , err = git .OpenRepository (repoPath (repo .OwnerName , repo .Name ))
110
113
if err != nil {
114
+ log .Error ("Error whilst opening git repo for %-v" , repo )
111
115
return err
112
116
}
113
117
}
114
118
115
119
commit , err := gitRepo .GetTagCommit (release .TagName )
116
120
if err != nil {
121
+ if git .IsErrNotExist (err ) {
122
+ log .Warn ("Unable to find commit %s for Tag: %s in %-v. Cannot update publisher ID." , err .(* git.ErrNotExist ).ID , release .TagName , repo )
123
+ continue
124
+ }
125
+ log .Error ("Error whilst getting commit for Tag: %s in %-v." , release .TagName , repo )
117
126
return fmt .Errorf ("GetTagCommit: %v" , err )
118
127
}
119
128
120
129
if user == nil || ! strings .EqualFold (user .Email , commit .Author .Email ) {
121
130
user = new (User )
122
131
_ , err = sess .Where ("email=?" , commit .Author .Email ).Get (user )
123
132
if err != nil {
133
+ log .Error ("Error whilst getting commit author by email: %s for Tag: %s in %-v." , commit .Author .Email , release .TagName , repo )
124
134
return err
125
135
}
126
136
@@ -133,6 +143,7 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
133
143
134
144
release .PublisherID = user .ID
135
145
if _ , err := sess .ID (release .ID ).Cols ("publisher_id" ).Update (release ); err != nil {
146
+ log .Error ("Error whilst updating publisher[%d] for release[%d] with tag name %s" , release .PublisherID , release .ID , release .TagName )
136
147
return err
137
148
}
138
149
}
0 commit comments