remove PKGBUILD_mod from everywhere - it's encoded in the mod_git_revision

2 files changed, 6 insertions, 10 deletions

diff --git a/lib/common-functions b/lib/common-functions
index b3c8e23..4000336 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -224,9 +224,6 @@ make_source_info() {
 
     {
       cd "${tmp_dir}"
-      # some additional info
-      printf 'PKGBUILD = %s\n' "${PKGBUILD}"
-      printf 'PKGBUILD_mod = %s\n' "${PKGBUILD_mod}"
       makepkg --printsrcinfo
       cd ..
     } > \
@@ -447,7 +444,6 @@ find_package_repository_to_package() {
 
 # extract_source_directory $pkgbase $repository $revision $mod_revision $output $sub_pkgrel
 # extract files found in the svn/git source directories
-# $PKGBUILD and $PKGBUILD_mod are expected to be set correctly
 
 extract_source_directory() {
 
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 888a505..b9f3a1c 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -147,15 +147,15 @@ mysql_add_package_source() {
   local repo
   local upstream_package_repository_id
 
-  if grep -qx 'PKGBUILD_mod = \S\+' "${srcinfo_file}"; then
-    uses_modification=1
-  else
+  if [ "${mod_git_revision}" = '0000000000000000000000000000000000000000' ]; then
     uses_modification=0
-  fi
-  if grep -qx 'PKGBUILD = \S\+' "${srcinfo_file}"; then
-    uses_upstream=1
   else
+    uses_modification=1
+  fi
+  if [ "${git_revision}" = '0000000000000000000000000000000000000000' ]; then
     uses_upstream=0
+  else
+    uses_upstream=1
   fi
 
   upstream_package_repository_id=$(