Ansgar pushed to branch deploy at Debian FTP Team / dak
Commits:
-
3afaf267
by Ansgar at 2022-09-18T23:15:18+02:00
-
644bc460
by Ansgar at 2022-09-25T12:52:17+02:00
-
853d2cf6
by Ansgar at 2022-09-25T12:53:51+02:00
2 changed files:
Changes:
| ... | ... | @@ -278,7 +278,7 @@ with |
| 278 | 278 | from newest_binaries
|
| 279 | 279 | group by architecture, source, version),
|
| 280 | 280 | unique_binaries_uptodate_arch as
|
| 281 | - (select ub.package, ub.architecture, ua.source, ua.version
|
|
| 281 | + (select ub.package, (select a.arch_string from architecture a where a.id = ub.architecture) as arch_string, ua.source, ua.version
|
|
| 282 | 282 | from unique_binaries ub
|
| 283 | 283 | join source s
|
| 284 | 284 | on ub.source = s.id
|
| ... | ... | @@ -286,18 +286,16 @@ with |
| 286 | 286 | on ub.architecture = ua.architecture and s.source = ua.source),
|
| 287 | 287 | unique_binaries_uptodate_arch_agg as
|
| 288 | 288 | (select ubua.package,
|
| 289 | - array(select unnest(array_agg(a.arch_string)) order by 1) as arch_list,
|
|
| 289 | + array_agg(ubua.arch_string order by ubua.arch_string) as arch_list,
|
|
| 290 | 290 | ubua.source, ubua.version
|
| 291 | 291 | from unique_binaries_uptodate_arch ubua
|
| 292 | - join architecture a
|
|
| 293 | - on ubua.architecture = a.id
|
|
| 294 | 292 | group by ubua.source, ubua.version, ubua.package),
|
| 295 | 293 | uptodate_packages as
|
| 296 | 294 | (select package, source, version
|
| 297 | 295 | from newest_binaries
|
| 298 | 296 | group by package, source, version),
|
| 299 | 297 | outdated_packages as
|
| 300 | - (select array(select unnest(array_agg(package)) order by 1) as pkg_list,
|
|
| 298 | + (select array_agg(package order by package) as pkg_list,
|
|
| 301 | 299 | arch_list, source, version
|
| 302 | 300 | from unique_binaries_uptodate_arch_agg
|
| 303 | 301 | where package not in
|
| ... | ... | @@ -130,6 +130,36 @@ EOF |
| 130 | 130 | assert-control-suite-list testing "${expected}"
|
| 131 | 131 | )
|
| 132 | 132 | |
| 133 | +# use control-suite --add to add a package to testing
|
|
| 134 | +(
|
|
| 135 | + dak control-suite --add=testing <<EOF
|
|
| 136 | +package 0.2-1 source
|
|
| 137 | +package 0.2-1 all
|
|
| 138 | +EOF
|
|
| 139 | + expected="$(cat <<EOF
|
|
| 140 | +package 0.1-1 all
|
|
| 141 | +package 0.2-1 all
|
|
| 142 | +package 0.1-1 source
|
|
| 143 | +package 0.2-1 source
|
|
| 144 | +EOF
|
|
| 145 | +)"
|
|
| 146 | + assert-control-suite-list testing "${expected}"
|
|
| 147 | +)
|
|
| 148 | + |
|
| 149 | +# and control-suite --remove to remove it again
|
|
| 150 | +(
|
|
| 151 | + dak control-suite --remove=testing <<EOF
|
|
| 152 | +package 0.2-1 source
|
|
| 153 | +package 0.2-1 all
|
|
| 154 | +EOF
|
|
| 155 | + expected="$(cat <<EOF
|
|
| 156 | +package 0.1-1 all
|
|
| 157 | +package 0.1-1 source
|
|
| 158 | +EOF
|
|
| 159 | +)"
|
|
| 160 | + assert-control-suite-list testing "${expected}"
|
|
| 161 | +)
|
|
| 162 | + |
|
| 133 | 163 | # dak ls run just for the sake of it
|
| 134 | 164 | (
|
| 135 | 165 | expected="$(cat <<EOF
|