diff options
| author | dancer <dancer> | 2003-03-10 10:02:11 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2003-03-10 10:02:11 +0000 |
| commit | ca62e88c1fd2574426cc228aef4a1c5064dd2853 (patch) | |
| tree | 5b7e06dc4982547f9f592c41f99fa5d06c2ad530 /pbuilder-satisfydepends | |
| parent | 27397d19776e5f5671ad57d823ba96a9c323dd24 (diff) | |
| download | pbuilder-ca62e88c1fd2574426cc228aef4a1c5064dd2853.tar pbuilder-ca62e88c1fd2574426cc228aef4a1c5064dd2853.tar.gz | |
+2003-03-10 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-satisfydepends: quote some strings... trying to be pedantic
+
+ * pbuilder-buildpackage-funcs: unset LOGNAME for when building with
+ real root privilage.
+ thanks Barak Pearlmutter <bap@cs.unm.edu>
+
+ * pbuilder.8: document X hooks which were previously undocumented.
+
+ * pbuilder-user-mode-linux (BUILDING_DSC_FILE): use readlink on real existing files.
+ GNU "readlink -f " exits with an exit code of 1 when the file does not
+ exist, debianutils readlink did not.
+
+ * pbuilder-runhooks (hooks): do not call readlink here,
+ since the file may not exist.
+
+ * pbuilder-checkparams (USE_PKGNAME_LOGFILE): use readlink on real existing files.
+
+ * pbuilder-buildpackage (PACKAGENAME): use readlink on real existing files.
+
Diffstat (limited to 'pbuilder-satisfydepends')
| -rw-r--r-- | pbuilder-satisfydepends | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends index 2370a43..fec9f58 100644 --- a/pbuilder-satisfydepends +++ b/pbuilder-satisfydepends @@ -97,26 +97,26 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/ {p=1} fi if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then #echo "Debug: $INSTALLPKG" - if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \ + if ! checkbuilddep_versiondeps "${CURRENTREALPKGNAME}" \ $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/') ; then echo " -> Does not satisfy version, not trying" continue; fi fi - echo " -> Trying "${CURRENTREALPKGNAME} + echo " -> Trying ${CURRENTREALPKGNAME}" if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME} >& /dev/null; then SATISFIED="yes" INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENTREALPKGNAME}" else echo " -> Cannot install ${CURRENTREALPKGNAME}; apt errors follow:" - if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME}; then + if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} "${CURRENTREALPKGNAME}"; then : fi # package could not be found. -- looking for alternative. PROVIDED="" - checkbuilddep_provides ${CURRENTREALPKGNAME} + checkbuilddep_provides "${CURRENTREALPKGNAME}" if [ -n "$PROVIDED" ]; then # something provides this package echo " -> Considering $PROVIDED to satisfy the dependency " @@ -168,7 +168,7 @@ tolower($0) ~ /^'"${BC_REGEXP}"':/ {p=1} tr " " "/" | \ awk 'BEGIN{RS=","} {print}'); do CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//') - echo " -> Considering "${CURRENTREALPKGNAME} + echo " -> Considering ${CURRENTREALPKGNAME}" if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then # this package has arch-conflicts. |