Allow a custom Suite when publishing

AUTHORS

@@ -38,3 +38,4 @@ List of contributors, in chronological order:
 * Shengjing Zhu (https://github.com/zhsj)
 * Nabil Bendafi (https://github.com/nabilbendafi)
 * Raphael Medaer (https://github.com/rmedaer)
+* Raul Benencia (https://github.com/rul)

cmd/publish_repo.go

@@ -46,6 +46,7 @@ Example:
 	cmd.Flag.String("notautomatic", "", "set value for NotAutomatic field")
 	cmd.Flag.String("butautomaticupgrades", "", "set  value for ButAutomaticUpgrades field")
 	cmd.Flag.String("label", "", "label to publish")
+	cmd.Flag.String("suite", "", "suite to publish (defaults to distribution)")
 	cmd.Flag.Bool("force-overwrite", false, "overwrite files in package pool in case of mismatch")
 	cmd.Flag.Bool("acquire-by-hash", false, "provide index files by hash")
 

cmd/publish_snapshot.go

@@ -130,6 +130,7 @@ func aptlyPublishSnapshotOrRepo(cmd *commander.Command, args []string) error {
 		published.ButAutomaticUpgrades = butAutomaticUpgrades
 	}
 	published.Label = context.Flags().Lookup("label").Value.String()
+	published.Suite = context.Flags().Lookup("suite").Value.String()
 
 	published.SkipContents = context.Config().SkipContentsPublishing
 
@@ -230,6 +231,7 @@ Example:
 	cmd.Flag.String("notautomatic", "", "overwrite value for NotAutomatic field")
 	cmd.Flag.String("butautomaticupgrades", "", "overwrite value for ButAutomaticUpgrades field")
 	cmd.Flag.String("label", "", "label to publish")
+	cmd.Flag.String("suite", "", "suite to publish (defaults to distribution)")
 	cmd.Flag.Bool("force-overwrite", false, "overwrite files in package pool in case of mismatch")
 	cmd.Flag.Bool("acquire-by-hash", false, "provide index files by hash")
 

completion.d/_aptly

@@ -452,6 +452,7 @@ local keyring="*-keyring=[gpg keyring to use when verifying Release file (could
                             "-butautomaticupgrades=[set value for ButAutomaticUpgrades field]:$bool"
                             "-distribution=[distribution name to publish]:distribution:($dists)"
                             "-label=[label to publish]:label: "
+                            "-suite=[suite to publish]:suite: "
                             "-notautomatic=[set value for NotAutomatic field]:notautomatic: "
                             "-origin=[origin name to publish]:origin: "
                             ${components_options[@]}

completion.d/aptly

@@ -499,7 +499,7 @@ _aptly()
           "snapshot"|"repo")
             if [[ $numargs -eq 0 ]]; then
               if [[ "$cur" == -* ]]; then
-                COMPREPLY=($(compgen -W "-acquire-by-hash -batch -butautomaticupgrades= -component= -distribution= -force-overwrite -gpg-key= -keyring= -label= -notautomatic= -origin= -passphrase= -passphrase-file= -secret-keyring= -skip-contents -skip-signing" -- ${cur}))
+                COMPREPLY=($(compgen -W "-acquire-by-hash -batch -butautomaticupgrades= -component= -distribution= -force-overwrite -gpg-key= -keyring= -label= -suite= -notautomatic= -origin= -passphrase= -passphrase-file= -secret-keyring= -skip-contents -skip-signing" -- ${cur}))
               else
                 if [[ "$subcmd" == "snapshot" ]]; then
                   COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))

deb/publish.go

@@ -44,6 +44,7 @@ type PublishedRepo struct {
 	NotAutomatic         string
 	ButAutomaticUpgrades string
 	Label                string
+	Suite                string
 	// Architectures is a list of all architectures published
 	Architectures []string
 	// SourceKind is "local"/"repo"
@@ -308,6 +309,7 @@ func (p *PublishedRepo) MarshalJSON() ([]byte, error) {
 		"Distribution":         p.Distribution,
 		"Label":                p.Label,
 		"Origin":               p.Origin,
+		"Suite":                p.Suite,
 		"NotAutomatic":         p.NotAutomatic,
 		"ButAutomaticUpgrades": p.ButAutomaticUpgrades,
 		"Prefix":               p.Prefix,
@@ -357,6 +359,10 @@ func (p *PublishedRepo) String() string {
 		extras = append(extras, fmt.Sprintf("label: %s", p.Label))
 	}
 
+	if p.Suite != "" {
+		extras = append(extras, fmt.Sprintf("suite: %s", p.Suite))
+	}
+
 	extra = strings.Join(extras, ", ")
 
 	if extra != "" {
@@ -485,6 +491,14 @@ func (p *PublishedRepo) GetLabel() string {
 	return p.Label
 }
 
+// GetSuite returns default or manual Suite:
+func (p *PublishedRepo) GetSuite() string {
+	if p.Suite == "" {
+		return p.Distribution
+	}
+	return p.Suite
+}
+
 // Publish publishes snapshot (repository) contents, links package files, generates Packages & Release files, signs them
 func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageProvider aptly.PublishedStorageProvider,
 	collectionFactory *CollectionFactory, signer pgp.Signer, progress aptly.Progress, forceOverwrite bool) error {
@@ -707,6 +721,7 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
 				release["Component"] = component
 				release["Origin"] = p.GetOrigin()
 				release["Label"] = p.GetLabel()
+				release["Suite"] = p.GetSuite()
 				if p.AcquireByHash {
 					release["Acquire-By-Hash"] = "yes"
 				}
@@ -763,7 +778,7 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
 		release["ButAutomaticUpgrades"] = p.ButAutomaticUpgrades
 	}
 	release["Label"] = p.GetLabel()
-	release["Suite"] = p.Distribution
+	release["Suite"] = p.GetSuite()
 	release["Codename"] = p.Distribution
 	release["Date"] = time.Now().UTC().Format("Mon, 2 Jan 2006 15:04:05 MST")
 	release["Architectures"] = strings.Join(utils.StrSlicesSubstract(p.Architectures, []string{ArchitectureSource}), " ")

man/aptly.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "APTLY" "1" "August 2019" "" ""
+.TH "APTLY" "1" "September 2019" "" ""
 .
 .SH "NAME"
 \fBaptly\fR \- Debian repository management tool
@@ -39,8 +39,8 @@ Configuration file is stored in JSON format (default values shown below):
   "downloadConcurrency": 4,
   "downloadSpeedLimit": 0,
   "downloadRetries": 0,
-  "architectures": [],
   "databaseOpenAttempts": 10,
+  "architectures": [],
   "dependencyFollowSuggests": false,
   "dependencyFollowRecommends": false,
   "dependencyFollowAllVariants": false,
@@ -124,7 +124,7 @@ number of retries for download attempts
 .
 .TP
 \fBdatabaseOpenAttempts\fR
-number of attempts to open DB if it's locked by other instance; could be overridden with option \fB\-db-open-attempts\fR
+number of attempts to open DB if it\(cqs locked by other instance; could be overridden with option \fB\-db\-open\-attempts\fR
 .
 .TP
 \fBarchitectures\fR
@@ -1454,6 +1454,10 @@ don\(cqt generate Contents indexes
 \-\fBskip\-signing\fR
 don\(cqt sign Release files with GPG
 .
+.TP
+\-\fBsuite\fR=
+suite to publish (defaults to distribution)
+.
 .SH "PUBLISH SNAPSHOT"
 \fBaptly\fR \fBpublish\fR \fBsnapshot\fR \fIname\fR [[\fIendpoint\fR:]\fIprefix\fR]
 .
@@ -1553,6 +1557,10 @@ don\(cqt generate Contents indexes
 \-\fBskip\-signing\fR
 don\(cqt sign Release files with GPG
 .
+.TP
+\-\fBsuite\fR=
+suite to publish (defaults to distribution)
+.
 .SH "UPDATE PUBLISHED REPOSITORY BY SWITCHING TO NEW SNAPSHOT"
 \fBaptly\fR \fBpublish\fR \fBswitch\fR \fIdistribution\fR [[\fIendpoint\fR:]\fIprefix\fR] \fInew\-snapshot\fR
 .
@@ -2066,4 +2074,14 @@ William Manley (https://github\.com/wmanley)
 .IP "\[ci]" 4
 Shengjing Zhu (https://github\.com/zhsj)
 .
+.IP "\[ci]" 4
+Nabil Bendafi (https://github\.com/nabilbendafi)
+.
+.IP "\[ci]" 4
+Raphael Medaer (https://github\.com/rmedaer)
+.
+.IP "\[ci]" 4
+Raul Benencia (https://github\.com/rul)
+.
 .IP "" 0
+

system/t06_publish/PublishSnapshot1Test_release_amd64

@@ -1,5 +1,6 @@
 Origin: LP-PPA-gladky-anton-gnuplot
 Label: . maverick
 Archive: maverick
+Suite: maverick
 Architecture: amd64
 Component: main

system/t06_publish/PublishSnapshot1Test_release_i386

@@ -1,5 +1,6 @@
 Origin: LP-PPA-gladky-anton-gnuplot
 Label: . maverick
 Archive: maverick
+Suite: maverick
 Architecture: i386
 Component: main

system/t06_publish/PublishSnapshot35Test_release_udeb_i386

@@ -1,5 +1,6 @@
 Origin: Debian
 Label: . stretch
 Archive: stretch
+Suite: stretch
 Architecture: i386
 Component: main