diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:24:42 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:24:42 -0300 |
| commit | 86d44994d4129c0cf0ffdc9cba71303b870f14d8 (patch) | |
| tree | 2d9f792fb34670b239d9d7fd6c4d3b7098254c8f | |
| parent | 235f41ad8687880f36c5dcc073853e2eb70540fb (diff) | |
fixed merge
| -rw-r--r-- | db-functions | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/db-functions b/db-functions index 6e0a6d3..fb20e3e 100644 --- a/db-functions +++ b/db-functions @@ -497,10 +497,7 @@ arch_repo_add() { # package files might be relative to repo dir pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null -<<<<<<< HEAD - repo-add -q "${repo}${DBEXT}" ${pkgs[@]} >/dev/null \ -======= - /usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ + repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ >>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 || error "repo-add ${repo}${DBEXT} ${pkgs[@]}" /usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \ @@ -520,11 +517,7 @@ arch_repo_remove() { error "No database found at '${dbfile}'" return 1 fi -<<<<<<< HEAD - repo-remove -q "${dbfile}" ${pkgs[@]} >/dev/null \ -======= - /usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} \ ->>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 + repo-remove -q "${dbfile}" ${pkgs[@]} \ || error "repo-remove ${dbfile} ${pkgs[@]}" /usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \ || error "repo-remove ${filesfile} ${pkgs[@]}" |