wip

Author: William Douglas

builder/bundleset.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	validBundleNameRegex   = regexp.MustCompile(`^[A-Za-z0-9-_]+$`)
+	validBundleNameRegex   = regexp.MustCompile(`^[A-Za-z0-9-_+.]+$`)
 	validPackageNameRegex  = regexp.MustCompile(`^[A-Za-z0-9-_+.]+$`)
 	bundleHeaderFieldRegex = regexp.MustCompile(`^# \[([A-Z]+)\]:\s*(.*)$`)
 )
@@ -90,7 +90,7 @@ func sortBundles(bundles bundleSet) ([]*bundle, error) {
 	visit = func(b *bundle) error {
 		switch mark[b] {
 		case Visiting:
-			return fmt.Errorf("cycle found in bundles: %s -> %s", strings.Join(visiting, " -> "), b.Name)
+			return nil
 		case NotVisited:
 			mark[b] = Visiting
 			visiting = append(visiting, b.Name)

swupd/manifest.go

@@ -187,18 +187,18 @@ func readManifestFileEntry(fields []string, m *Manifest) error {
 // CheckHeaderIsValid verifies that all header fields in the manifest are valid.
 func (m *Manifest) CheckHeaderIsValid() error {
 	if m.Header.Format == 0 {
-		return errors.New("manifest format not set")
+		return errors.Errorf("manifest format not set (%s)", m.Name)
 	}
 
 	if m.Header.Version == 0 {
-		return errors.New("manifest has version zero, version must be positive")
+		return errors.Errorf("manifest has version zero, version must be positive (%s)", m.Name)
 	}
 	if m.Header.FileCount == 0 {
-		return errors.New("manifest has a zero file count")
+		return fmt.Errorf("manifest has a zero file count (%s)", m.Name)
 	}
 
 	if m.Header.TimeStamp.IsZero() {
-		return errors.New("manifest timestamp not set")
+		return errors.Errorf("manifest timestamp not set (%s)", m.Name)
 	}
 
 	// Includes are not required.
@@ -754,6 +754,9 @@ func (m *Manifest) addManifestFiles(ui UpdateInfo, c config) error {
 		for f := range m.BundleInfo.Files {
 			isIncluded := false
 			for _, inc := range includes {
+				if inc.Name == m.Name {
+					continue
+				}
 				if _, ok := inc.BundleInfo.Files[f]; ok {
 					isIncluded = true
 					break