vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-01 04:40:38 +00:00
Code Issues Projects Releases Wiki Activity

Sort package lists when searching or showing objects

Browse Source 
Fixes #135
Fixes #214
This commit is contained in:
Andrey Smirnov
2017-05-04 23:47:05 +03:00
parent 33357c1fe4
commit 589dc93380
58 changed files with 640807 additions and 640872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t09_repo/AddRepo10Test_repo_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/AddRepo13Test_repo_show
+1 -1
View File
@@ -7,5 +7,5 @@ Packages:
dmraid-udeb_1.0.0.rc16-4.1_amd64
dmraid-udeb_1.0.0.rc16-4.1_i386
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/AddRepo2Test_repo_show
+1 -1
View File
@@ -4,5 +4,5 @@ Default Distribution: squeeze
Default Component: main
Number of packages: 2
Packages:
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/AddRepo3Test_repo_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/CopyRepo1Test_repo1_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/CopyRepo2Test_repo1_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/CopyRepo4Test_repo1_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/CreateRepo7Test_repo_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/ImportRepo1Test_repo_show
+3 -3
View File
@@ -4,8 +4,8 @@ Default Distribution: squeeze
Default Component: main
Number of packages: 5
Packages:
nginx_1.2.1-2.2+wheezy2_all
unpaper_0.4.2-1_amd64
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
nginx_1.2.1-2.2+wheezy2_all
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
unpaper_0.4.2-1_amd64
system/t09_repo/ImportRepo2Test_repo_show
+9 -9
View File
@@ -4,23 +4,23 @@ Default Distribution: squeeze
Default Component: main
Number of packages: 20
Packages:
gcc-4.7-base_4.7.2-5_amd64
libc-bin_2.13-38+deb7u1_amd64
libc6_2.13-38+deb7u1_amd64
libgcc1_1:4.7.2-5_amd64
multiarch-support_2.13-38+deb7u1_amd64
userinfo_2.2-3_amd64
dpkg_1.16.12_i386
gcc-4.7-base_4.7.2-5_amd64
gcc-4.7-base_4.7.2-5_i386
libboost-program-options-dev_1.49.0.1_i386
libbz2-1.0_1.0.6-4_i386
libc-bin_2.13-38+deb7u1_amd64
libc-bin_2.13-38+deb7u1_i386
libc6_2.13-38+deb7u1_amd64
libc6_2.13-38+deb7u1_i386
libgcc1_1:4.7.2-5_amd64
libgcc1_1:4.7.2-5_i386
liblzma5_5.1.1alpha+20120614-2_i386
libselinux1_2.1.9-5_i386
multiarch-support_2.13-38+deb7u1_amd64
multiarch-support_2.13-38+deb7u1_i386
tar_1.26+dfsg-0.1_i386
zlib1g_1:1.2.7.dfsg-13_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
tar_1.26+dfsg-0.1_i386
userinfo_2.2-3_amd64
zlib1g_1:1.2.7.dfsg-13_i386
system/t09_repo/IncludeRepo2Test_repo_show
+2 -2
View File
@@ -5,7 +5,7 @@ Default Component: main
Number of packages: 5
Packages:
hardlink_0.2.1_amd64
libboost-program-options-dev_1.49.0.1_i386
hardlink_0.2.1_source
pyspi_0.6.1-1.3_source
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/MoveRepo4Test_repo1_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/RemoveRepo4Test_repo_show
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: main
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/SearchRepo1Test_gold
+1 -2
View File
@@ -1,4 +1,3 @@
aolserver4-dev_4.5.1-15.1_i386
apache2-prefork-dev_2.2.22-13+deb7u1_i386
apache2-threaded-dev_2.2.22-13+deb7u1_i386
@@ -4040,4 +4039,4 @@ yorick-dev_2.2.02+dfsg-6_i386
zathura-dev_0.1.2-4_all
zlib1g-dev_1:1.2.7.dfsg-13_i386
znc-dev_0.206-2_i386
zsh-dev_4.3.17-1_i386
zsh-dev_4.3.17-1_i386
system/t09_repo/SearchRepo4Test_gold
+3 -4
View File
@@ -1,4 +1,3 @@
coreutils_8.13-3.5_amd64
coreutils_8.13-3.5_i386
debconf_1.5.49_all
@@ -8,8 +7,8 @@ fontconfig-config_2.9.0-7.1_all
fonts-freefont-ttf_20120503-1_all
gcc-4.7-base_4.7.2-5_amd64
gcc-4.7-base_4.7.2-5_i386
gsfonts-x11_0.22_all
gsfonts_1:8.11+urwcyr1.0.7~pre44-4.2_all
gsfonts-x11_0.22_all
libacl1_2.2.51-8_amd64
libacl1_2.2.51-8_i386
libattr1_1:2.4.46-8_amd64
@@ -74,12 +73,12 @@ libxslt1.1_1.1.26-14.1_i386
lsb-base_4.1+Debian8+deb7u1_all
multiarch-support_2.13-38+deb7u1_amd64
multiarch-support_2.13-38+deb7u1_i386
nginx_1.2.1-2.2+wheezy2_all
nginx-common_1.2.1-2.2+wheezy2_all
nginx-full_1.2.1-2.2+wheezy2_amd64
nginx-full_1.2.1-2.2+wheezy2_i386
nginx-light_1.2.1-2.2+wheezy2_amd64
nginx-light_1.2.1-2.2+wheezy2_i386
nginx_1.2.1-2.2+wheezy2_all
perl-base_5.14.2-21+deb7u1_amd64
perl-base_5.14.2-21+deb7u1_i386
tar_1.26+dfsg-0.1_amd64
@@ -92,4 +91,4 @@ xfonts-encodings_1:1.0.4-1_all
xfonts-utils_1:7.7~1_amd64
xfonts-utils_1:7.7~1_i386
zlib1g_1:1.2.7.dfsg-13_amd64
zlib1g_1:1.2.7.dfsg-13_i386
zlib1g_1:1.2.7.dfsg-13_i386
system/t09_repo/SearchRepo5Test_gold
+1 -2
View File
@@ -1,4 +1,3 @@
aolserver4-dev#4.5.1-15.1
apache2-prefork-dev#2.2.22-13+deb7u1
apache2-threaded-dev#2.2.22-13+deb7u1
@@ -4040,4 +4039,4 @@ yorick-dev#2.2.02+dfsg-6
zathura-dev#0.1.2-4
zlib1g-dev#1:1.2.7.dfsg-13
znc-dev#0.206-2
zsh-dev#4.3.17-1
zsh-dev#4.3.17-1
system/t09_repo/SearchRepo6Test_gold
+7572 -7573
View File
File diff suppressed because it is too large Load Diff
system/t09_repo/ShowRepo2Test_gold
+1 -1
View File
@@ -5,5 +5,5 @@ Default Component: contrib
Number of packages: 3
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
pyspi_0.6.1-1.4_source
pyspi_0.6.1-1.3_source
system/t09_repo/search.py
-8
View File
@@ -1,16 +1,11 @@
from lib import BaseTest
def sortLines(_, s):
return "\n".join(sorted(s.split("\n")))
class SearchRepo1Test(BaseTest):
"""
search repo: regular search
"""
fixtureDB = True
outputMatchPrepare = sortLines
fixtureCmds = ["aptly repo create wheezy-main", "aptly repo import wheezy-main wheezy-main Name"]
runCmd = "aptly repo search wheezy-main '$$Architecture (i386), Name (% *-dev)'"
@@ -39,7 +34,6 @@ class SearchRepo4Test(BaseTest):
"""
fixtureDB = True
fixtureCmds = ["aptly repo create wheezy-main", "aptly repo import wheezy-main wheezy-main Name"]
outputMatchPrepare = sortLines
runCmd = "aptly repo search -with-deps wheezy-main 'Name (nginx)'"
@@ -48,7 +42,6 @@ class SearchRepo5Test(BaseTest):
search repo: with -format
"""
fixtureDB = True
outputMatchPrepare = sortLines
fixtureCmds = ["aptly repo create wheezy-main", "aptly repo import wheezy-main wheezy-main Name"]
runCmd = "aptly repo search -format='{{.Package}}#{{.Version}}' wheezy-main '$$Architecture (i386), Name (% *-dev)'"
@@ -58,6 +51,5 @@ class SearchRepo6Test(BaseTest):
search repo: without query
"""
fixtureDB = True
outputMatchPrepare = sortLines
fixtureCmds = ["aptly repo create wheezy-main", "aptly repo import wheezy-main wheezy-main Name"]
runCmd = "aptly repo search wheezy-main"