From: Nathan Wagner <nw@hydaspes.if.org>
Date: Sat, 6 Oct 2018 17:57:40 +0000 (+0000)
Subject: merge elf information
X-Git-Tag: v0.2.0~4
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=d278087cb0f574f43cbdefd6a5f2db2e5305d5f1

merge elf information
---

diff --git a/zpm-merge b/zpm-merge
index ada48aa..aa2b71f 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -134,11 +134,11 @@ where
 PF.pkgid = '$pkgid'
 on conflict (hash) do nothing
 ;
+
 EOS
 fi
 
 # scripts
-# actual files
 if [ $mergescripts -eq 1 ]; then
 cat<<EOS
 insert into files
@@ -152,10 +152,11 @@ on conflict (hash) do nothing
 EOS
 fi
 
+package=$(zpm quote "$name")
+version=$(zpm quote "$version")
+
 if [ -n "$newstatus" ]; then
 	newstatus=$(zpm quote "$newstatus")
-	package=$(zpm quote "$name")
-	version=$(zpm quote "$version")
 cat <<EOS
 update packages set status = '$newstatus'
 where package = '$package' and version = '$version' and release = '$release'
@@ -164,6 +165,17 @@ EOS
 fi
 
 # elf info
+cat <<EOS
+insert or ignore into elfneeded
+select * from remote.elfneeded
+--on conflict (file, needed) do nothing
+;
+insert or ignore into elflibraries
+select * from remote.elflibraries
+--on conflict (file, soname) do nothing
+;
+EOS
+
 
 # TODO check for adding file contents
 echo 'commit;'