X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=aa2b71fb3b1d85933178ebce4bb6175a8b7ee2c8;hb=50b0480e6259c1e4bed6e6dc7990e080ceb5e855;hp=d9833733b09baeda9bbea2099b02e1d7dc6246e7;hpb=d16a68de1401cc2274a8353f52edae012af11b3b;p=zpackage

diff --git a/zpm-merge b/zpm-merge
index d983373..aa2b71f 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -67,7 +67,7 @@ fi
 
 # try to get from package file
 if [ -z "$release" ]; then
-	pkgid=$(zpm findpkg $pkgfile $pkgid)
+	pkgid=$(zpm findpkg -f $pkgfile $pkgid)
 	if [ -z "$pkgid" ]; then
 		die cannot find package id
 	fi
@@ -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;'