Fix system tests for custom codenames

2026-01-11 03:11:50 +00:00 · 2022-08-18 16:14:13 +01:00
parent 904265120b
commit b3d9055059
5 changed files with 8 additions and 1 deletions
--- a/1
+++ b/1
@@ -50,3 +50,4 @@ List of contributors, in chronological order:
 * Russell Greene (https://github.com/russelltg)
 * Wade Simmons (https://github.com/wadey)
 * Steven Stone (https://github.com/smstone)
+* Josh Bayfield (https://github.com/jbayfield)
--- a/completion.d/aptly
+++ b/completion.d/aptly
@@ -503,7 +503,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= -suite= -codename= -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= -codename= -notautomatic= -origin= -passphrase= -passphrase-file= -secret-keyring= -skip-contents -skip-bz2 -skip-signing" -- ${cur}))
              else
                if [[ "$subcmd" == "snapshot" ]]; then
                  COMPREPLY=($(compgen -W "$(__aptly_snapshot_list)" -- ${cur}))
--- a/system/t06_publish/PublishList5Test_gold
+++ b/system/t06_publish/PublishList5Test_gold
@@ -6,6 +6,7 @@
      "i386"
    ],
    "ButAutomaticUpgrades": "",
+    "Codename": "",
    "Distribution": "maverick",
    "Label": "",
    "NotAutomatic": "",
@@ -29,6 +30,7 @@
      "amd64"
    ],
    "ButAutomaticUpgrades": "",
+    "Codename": "",
    "Distribution": "wheezy",
    "Label": "",
    "NotAutomatic": "",
@@ -53,6 +55,7 @@
      "i386"
    ],
    "ButAutomaticUpgrades": "",
+    "Codename": "",
    "Distribution": "maverick",
    "Label": "",
    "NotAutomatic": "",
@@ -77,6 +80,7 @@
      "i386"
    ],
    "ButAutomaticUpgrades": "",
+    "Codename": "",
    "Distribution": "maverick",
    "Label": "label1",
    "NotAutomatic": "",
--- a/system/t06_publish/PublishShow3Test_gold
+++ b/system/t06_publish/PublishShow3Test_gold
@@ -5,6 +5,7 @@
    "i386"
  ],
  "ButAutomaticUpgrades": "",
+  "Codename": "",
  "Distribution": "maverick",
  "Label": "",
  "NotAutomatic": "",
--- a/system/t06_publish/PublishShow4Test_gold
+++ b/system/t06_publish/PublishShow4Test_gold
@@ -5,6 +5,7 @@
    "i386"
  ],
  "ButAutomaticUpgrades": "",
+  "Codename": "",
  "Distribution": "maverick",
  "Label": "",
  "NotAutomatic": "",