|
Lines 286-294
Link Here
|
| 286 |
if use staging; then |
286 |
if use staging; then |
| 287 |
local WINE_COMMIT=${EGIT_VERSION} |
287 |
local WINE_COMMIT=${EGIT_VERSION} |
| 288 |
|
288 |
|
|
|
289 |
# Staging does not use the same commit as WINE, temporarily unset |
| 290 |
unset EGIT_COMMIT |
| 291 |
|
| 289 |
git-r3_fetch "${STAGING_EGIT_REPO_URI}" |
292 |
git-r3_fetch "${STAGING_EGIT_REPO_URI}" |
| 290 |
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
293 |
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 291 |
|
294 |
|
|
|
295 |
# Restore WINE commit |
| 296 |
EGIT_COMMIT=${WINE_COMMIT} |
| 297 |
|
| 292 |
local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
298 |
local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 293 |
|
299 |
|
| 294 |
if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then |
300 |
if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then |