Bump reva
This commit is contained in:
committed by
Ralf Haferkamp
parent
05c2b39281
commit
31f24a65b3
Generated
Vendored
-1
@@ -27,7 +27,6 @@ type Config struct {
|
||||
FavoriteStorageDrivers map[string]map[string]interface{} `mapstructure:"favorite_storage_drivers"`
|
||||
Version string `mapstructure:"version"`
|
||||
VersionString string `mapstructure:"version_string"`
|
||||
Edition string `mapstructure:"edition"`
|
||||
Product string `mapstructure:"product"`
|
||||
ProductName string `mapstructure:"product_name"`
|
||||
ProductVersion string `mapstructure:"product_version"`
|
||||
|
||||
Generated
Vendored
-1
@@ -34,7 +34,6 @@ func (s *svc) doStatus(w http.ResponseWriter, r *http.Request) {
|
||||
NeedsDBUpgrade: false,
|
||||
Version: s.c.Version,
|
||||
VersionString: s.c.VersionString,
|
||||
Edition: s.c.Edition,
|
||||
ProductName: s.c.ProductName,
|
||||
ProductVersion: s.c.ProductVersion,
|
||||
Product: s.c.Product,
|
||||
|
||||
Generated
Vendored
-4
@@ -69,9 +69,6 @@ func (h *Handler) Init(c *config.Config) {
|
||||
if h.c.Capabilities.Core.Status.VersionString == "" {
|
||||
h.c.Capabilities.Core.Status.VersionString = "10.0.11" // TODO make build determined
|
||||
}
|
||||
if h.c.Capabilities.Core.Status.Edition == "" {
|
||||
h.c.Capabilities.Core.Status.Edition = "" // TODO make build determined
|
||||
}
|
||||
if h.c.Capabilities.Core.Status.ProductName == "" {
|
||||
h.c.Capabilities.Core.Status.ProductName = "reva" // TODO make build determined
|
||||
}
|
||||
@@ -220,7 +217,6 @@ func (h *Handler) Init(c *config.Config) {
|
||||
Minor: 0,
|
||||
Micro: 11,
|
||||
String: "10.0.11",
|
||||
Edition: "",
|
||||
Product: "reva",
|
||||
ProductVersion: "",
|
||||
}
|
||||
|
||||
-7
@@ -297,13 +297,6 @@ func VersionString(val string) Option {
|
||||
}
|
||||
}
|
||||
|
||||
// Edition provides a function to set the Edition config option.
|
||||
func Edition(val string) Option {
|
||||
return func(o *Options) {
|
||||
o.config.Edition = val
|
||||
}
|
||||
}
|
||||
|
||||
// Product provides a function to set the Product config option.
|
||||
func Product(val string) Option {
|
||||
return func(o *Options) {
|
||||
|
||||
-2
@@ -142,7 +142,6 @@ type Status struct {
|
||||
NeedsDBUpgrade ocsBool `json:"needsDbUpgrade" xml:"needsDbUpgrade"`
|
||||
Version string `json:"version" xml:"version"`
|
||||
VersionString string `json:"versionstring" xml:"versionstring"`
|
||||
Edition string `json:"edition" xml:"edition"`
|
||||
ProductName string `json:"productname" xml:"productname"`
|
||||
Product string `json:"product" xml:"product"`
|
||||
ProductVersion string `json:"productversion" xml:"productversion"`
|
||||
@@ -309,7 +308,6 @@ type Version struct {
|
||||
Minor int `json:"minor" xml:"minor"`
|
||||
Micro int `json:"micro" xml:"micro"` // = patch level
|
||||
String string `json:"string" xml:"string"`
|
||||
Edition string `json:"edition" xml:"edition"`
|
||||
Product string `json:"product" xml:"product"`
|
||||
ProductVersion string `json:"productversion" xml:"productversion"`
|
||||
}
|
||||
|
||||
+1
-1
@@ -139,7 +139,7 @@ func New(m map[string]interface{}, stream events.Stream, log *zerolog.Logger) (s
|
||||
Permissions: p,
|
||||
EventStream: stream,
|
||||
UserMapper: um,
|
||||
DisableVersioning: false,
|
||||
DisableVersioning: o.DisableVersioning,
|
||||
Trashbin: trashbin,
|
||||
}
|
||||
|
||||
|
||||
+12
-1
@@ -62,7 +62,18 @@ func (tp *Tree) CreateRevision(ctx context.Context, n *node.Node, version string
|
||||
defer sf.Close()
|
||||
vf, err := os.OpenFile(versionPath, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0600)
|
||||
if err != nil {
|
||||
return "", err
|
||||
if os.IsExist(err) {
|
||||
err := os.Remove(versionPath)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
vf, err = os.OpenFile(versionPath, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0600)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
} else {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
defer vf.Close()
|
||||
if _, err := io.Copy(vf, sf); err != nil {
|
||||
|
||||
Generated
Vendored
+12
-1
@@ -61,7 +61,18 @@ func (tp *Tree) CreateRevision(ctx context.Context, n *node.Node, version string
|
||||
// create version node
|
||||
vf, err := os.OpenFile(versionPath, os.O_CREATE|os.O_EXCL, 0600)
|
||||
if err != nil {
|
||||
return "", err
|
||||
if os.IsExist(err) {
|
||||
err := os.Remove(versionPath)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
vf, err = os.OpenFile(versionPath, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0600)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
} else {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
defer vf.Close()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user