Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
4 src-sh/pc-metapkgmanager/pc-metapkgmanager
@@ -78,7 +78,7 @@ add_metapkgs() {
download_cache_packages "pkg-static install -U -n $pkgName"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "install -U -F -y $pkgName"
+ check_pkg_conflicts "install -FUy $pkgName"
if [ $? -ne 0 ] ; then
exit 1
fi
@@ -307,7 +307,7 @@ intercept_pkg_dl()
download_cache_packages "pkg $op $flags"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "${op} -F $flags"
+ check_pkg_conflicts "${op} -FUy $flags"
if [ $? -ne 0 ] ; then
exit 1
fi
View
2  src-sh/pc-updatemanager/pc-updatemanager
@@ -548,7 +548,7 @@ update_pkgs()
download_cache_packages "pkg-static upgrade -U -n $1"
fi
- check_pkg_conflicts "upgrade -U -F -y $1"
+ check_pkg_conflicts "upgrade -FUy $1"
if [ $? -ne 0 ] ; then
exit 1
fi
View
27 src-sh/xtrafiles/local/share/pcbsd/bin/pkg
@@ -38,33 +38,8 @@ intercept_pkg_dl()
fullopts="$@"
op="$1"
- # Make sure we insert some flags we need
- while [ $# -gt 0 ]; do
- if [ $count -gt 0 ] ; then
- # If we are already using -n, we can skip downloading anything
- if [ "$1" = "-n" ] ; then
- pkg $fullopts
- exit $?
- fi
- flags="$flags $1"
- else
- flags="-U -n"
- fi
- count=`expr $count + 1`
- shift
- done
-
- # Lets pre-download all packages
- download_cache_packages "pkg $op $flags"
-
- # Lets check for any conflicts doing this install
- check_pkg_conflicts "${op} -F $flags"
- if [ $? -ne 0 ] ; then
- exit 1
- fi
-
# Time to run pkgng and let it do its thing
- pkg $fullopts
+ pkg-static $fullopts
result=$?
# Nobody likes a litter bug

No commit comments for this range

Something went wrong with that request. Please try again.