]> xenbits.xensource.com Git - osstest.git/commitdiff
target_run_apt: Correctly escape line wrapping flight-60083 flight-60111 flight-60115 flight-60116 flight-60120 flight-60121 flight-60127 flight-60133 flight-60134 flight-60138 flight-60139 flight-60140 flight-60141 flight-60146 flight-60147 flight-60148 flight-60150 flight-60151 flight-60152 flight-60153 flight-60154 flight-60155 flight-60156 flight-60157 flight-60158 flight-60159 flight-60160 flight-60161 flight-60162 flight-60163 flight-60164 flight-60165 flight-60166 flight-60167 flight-60168 flight-60169 flight-60170 flight-60171 flight-60172 flight-60173 flight-60174 flight-60175 flight-60176 flight-60177 flight-60178 flight-60179 flight-60180 flight-60181 flight-60182 flight-60183 flight-60185 flight-60186 flight-60187 flight-60188 flight-60189 flight-60190 flight-60191 flight-60192 flight-60193 flight-60194 flight-60195 flight-60197 flight-60198 flight-60199 flight-60200 flight-60201 flight-60202 flight-60203 flight-60204 flight-60205 flight-60206 flight-60207 flight-60208 flight-60209 flight-60210 flight-60211 flight-60212 flight-60213 flight-60214 flight-60215 flight-60216 flight-60217 flight-60218 flight-60219 flight-60220 flight-60221 flight-60222 flight-60223 flight-60224 flight-60225 flight-60226 flight-60227 flight-60228 flight-60229 flight-60373 flight-60374 flight-60384 flight-60385 flight-60386 flight-60387 flight-60388 flight-60389 flight-60390 flight-60391 flight-60392 flight-60393 flight-60394 flight-60395 flight-60396 flight-60397 flight-60539 flight-60541 flight-60542 flight-60543 flight-60544 flight-60545 flight-60546 flight-60547 flight-60548 flight-60549 flight-60550 flight-60551 flight-60552 flight-60553 flight-60554 flight-60555 flight-60556 flight-60557 flight-60558 flight-60559 flight-60560 flight-60561 flight-60562 flight-60563 flight-60564 flight-60565 flight-60566 flight-60567 flight-60568 flight-60569 flight-60570 flight-60571 flight-60572 flight-60573 flight-60574 flight-60575 flight-60576 flight-60577 flight-60578 flight-60579 flight-60580 flight-60581 flight-60582 flight-60583 flight-60584 flight-60585 flight-60586 flight-60587 flight-60588 flight-60589 flight-60590 flight-60591 flight-60592 flight-60593 flight-60594 flight-60595 flight-60596 flight-60597 flight-60598 flight-60599 flight-60600 flight-60601 flight-60602
authorIan Campbell <ian.campbell@citrix.com>
Thu, 23 Jul 2015 16:04:01 +0000 (17:04 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 28 Jul 2015 15:04:51 +0000 (16:04 +0100)
Otherwise the envvars are on the preceding line and therefore not set
in the apt-get process.

I broke this in 6fea4be08306 "apt: lock osstest's usages of apt-get
against each other", committed in January.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Osstest/TestSupport.pm

index 755a4ab4bb8b7075ead88c79b6dbc3007504496c..4696d68c6dc47ce660fc937b506776e18cbdcfa7 100644 (file)
@@ -434,7 +434,7 @@ sub target_putfile_root ($$$$;$) {
 sub target_run_apt {
     my ($ho, @aptopts) = @_;
     target_cmd_root($ho,
-        "DEBIAN_PRIORITY=critical UCF_FORCE_CONFFOLD=y \
+        "DEBIAN_PRIORITY=critical UCF_FORCE_CONFFOLD=y \\
             with-lock-ex -w /var/lock/osstest-apt apt-get @aptopts", 3000);
 }
 sub target_install_packages {