@@ -109,8 +109,8 @@ script_action_body() {
109109 mkdir some_repo root
110110 mkdir -p pkg_A/usr/bin
111111 echo " A-1.0_1" > pkg_A/usr/bin/foo
112- create_script_stdout " install" pkg_A/INSTALL
113- create_script_stdout " remove" pkg_A/REMOVE
112+ create_script_stdout " install 1.0_1 " pkg_A/INSTALL
113+ create_script_stdout " remove 1.0_1 " pkg_A/REMOVE
114114
115115 cd some_repo
116116 xbps-create -A noarch -n A-1.0_1 -s " A pkg" ../pkg_A
@@ -122,11 +122,13 @@ script_action_body() {
122122 xbps-install -C empty.conf -r root --repository=$PWD /some_repo -y A > out
123123 atf_check_equal $? 0
124124
125- grep " ^install pre A 1.0_1 no no" out
125+ grep " ^install 1.0_1 pre A 1.0_1 no no" out
126126 atf_check_equal $? 0
127- grep " ^install post A 1.0_1 no no" out
127+ grep " ^install 1.0_1 post A 1.0_1 no no" out
128128 atf_check_equal $? 0
129129
130+ create_script_stdout " install 1.1_1" pkg_A/INSTALL
131+ create_script_stdout " remove 1.1_1" pkg_A/REMOVE
130132 cd some_repo
131133 xbps-create -A noarch -n A-1.1_1 -s " A pkg" ../pkg_A
132134 atf_check_equal $? 0
@@ -137,25 +139,43 @@ script_action_body() {
137139 xbps-install -C empty.conf -r root --repository=$PWD /some_repo -yu > out
138140 atf_check_equal $? 0
139141
140- grep " ^remove pre A 1.0_1 yes no" out
142+ grep " ^remove 1.0_1 pre A 1.0_1 yes no" out
141143 atf_check_equal $? 0
142- grep " ^install pre A 1.1_1 yes no" out
144+ grep " ^install 1.1_1 pre A 1.1_1 yes no" out
143145 atf_check_equal $? 0
144- grep " ^remove post A 1.0_1 yes no" out
146+ grep " ^remove 1.0_1 post A 1.0_1 yes no" out
145147 atf_check_equal $? 1
146- grep " ^remove purge A 1.0_1 yes no" out
148+ grep " ^remove 1.0_1 purge A 1.0_1 yes no" out
147149 atf_check_equal $? 1
148- grep " ^install post A 1.1_1 yes no" out
150+ grep " ^install 1.1_1 post A 1.1_1 yes no" out
151+ atf_check_equal $? 0
152+
153+ create_script_stdout " install 1.0_2" pkg_A/INSTALL
154+ create_script_stdout " remove 1.0_2" pkg_A/REMOVE
155+ cd some_repo
156+ xbps-create -A noarch -n A-1.0_2 -s " A pkg" --reverts " 1.1_1" ../pkg_A
157+ atf_check_equal $? 0
158+ xbps-rindex -d -a $PWD /* .xbps
159+ atf_check_equal $? 0
160+ cd ..
161+
162+ xbps-install -C empty.conf -r root --repository=$PWD /some_repo -yu > out
163+ atf_check_equal $? 0
164+ grep " ^remove 1.1_1 pre A 1.1_1 yes no" out
165+ atf_check_equal $? 0
166+ grep " ^install 1.0_2 pre A 1.0_2 yes no" out
167+ atf_check_equal $? 0
168+ grep " ^install 1.0_2 post A 1.0_2 yes no" out
149169 atf_check_equal $? 0
150170
151171 xbps-remove -C empty.conf -r root -y A > out
152172 atf_check_equal $? 0
153173
154- grep " ^remove pre A 1.1_1 no no" out
174+ grep " ^remove 1.0_2 pre A 1.0_2 no no" out
155175 atf_check_equal $? 0
156- grep " ^remove post A 1.1_1 no no" out
176+ grep " ^remove 1.0_2 post A 1.0_2 no no" out
157177 atf_check_equal $? 0
158- grep " ^remove purge A 1.1_1 no no" out
178+ grep " ^remove 1.0_2 purge A 1.0_2 no no" out
159179 atf_check_equal $? 0
160180}
161181
0 commit comments