diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:26:03 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:26:03 -0300 |
| commit | e891caf97ee563e52b8f5e1f2448db2b0dc49228 (patch) | |
| tree | d74e4ba4d4e53b682731aa866afc27e8bdd57686 | |
| parent | 86d44994d4129c0cf0ffdc9cba71303b870f14d8 (diff) | |
More merge fixes
| -rw-r--r-- | db-functions | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/db-functions b/db-functions index fb20e3e..ff38d62 100644 --- a/db-functions +++ b/db-functions @@ -498,7 +498,6 @@ arch_repo_add() { # package files might be relative to repo dir pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ ->>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 || error "repo-add ${repo}${DBEXT} ${pkgs[@]}" /usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \ || error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}" |