summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-10-08 20:43:25 +0000
committerAurelien Foret <aurelien@archlinux.org>2005-10-08 20:43:25 +0000
commit0d6a2edaa8e39f9d7b77f0a023e8a2bfdab7a16d (patch)
treecc22b868e74e5e716cbaa8ed0b6f2629b978ade4 /scripts
parent5ef51b3e266cf43411947248886372001fdb207a (diff)
downloadpacman-0d6a2edaa8e39f9d7b77f0a023e8a2bfdab7a16d.tar.xz
Moved the REPLACES and FORCE package fields from DESC to DEPENDS db entry
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gensync22
-rwxr-xr-xscripts/updatesync22
2 files changed, 22 insertions, 22 deletions
diff --git a/scripts/gensync b/scripts/gensync
index 49a2939a..7c3420fd 100755
--- a/scripts/gensync
+++ b/scripts/gensync
@@ -100,17 +100,6 @@ db_write_entry()
done
echo "" >>desc
fi
- if [ ${#replaces[*]} -gt 0 ]; then
- echo "%REPLACES%" >>desc
- for it in "${replaces[@]}"; do
- echo "$it" >>desc
- done
- echo "" >>desc
- fi
- if [ "$force" = "y" -o "$force" = "Y" ]; then
- echo "%FORCE%" >>desc
- echo "" >>desc
- fi
# depends
: >depends
if [ ${#depends[*]} -gt 0 ]; then
@@ -134,6 +123,17 @@ db_write_entry()
done
echo "" >>depends
fi
+ if [ ${#replaces[*]} -gt 0 ]; then
+ echo "%REPLACES%" >>depends
+ for it in "${replaces[@]}"; do
+ echo "$it" >>depends
+ done
+ echo "" >>depends
+ fi
+ if [ "$force" = "y" -o "$force" = "Y" ]; then
+ echo "%FORCE%" >>depends
+ echo "" >>depends
+ fi
# preserve the modification time
touch -r $1 desc depends
}
diff --git a/scripts/updatesync b/scripts/updatesync
index 943af8a5..10614d5b 100755
--- a/scripts/updatesync
+++ b/scripts/updatesync
@@ -103,17 +103,6 @@ db_write_entry()
done
echo "" >>desc
fi
- if [ ${#replaces[*]} -gt 0 ]; then
- echo "%REPLACES%" >>desc
- for it in "${replaces[@]}"; do
- echo "$it" >>desc
- done
- echo "" >>desc
- fi
- if [ "$force" = "y" -o "$force" = "Y" ]; then
- echo "%FORCE%" >>desc
- echo "" >>desc
- fi
# depends
: >depends
if [ ${#depends[*]} -gt 0 ]; then
@@ -137,6 +126,17 @@ db_write_entry()
done
echo "" >>depends
fi
+ if [ ${#replaces[*]} -gt 0 ]; then
+ echo "%REPLACES%" >>depends
+ for it in "${replaces[@]}"; do
+ echo "$it" >>depends
+ done
+ echo "" >>depends
+ fi
+ if [ "$force" = "y" -o "$force" = "Y" ]; then
+ echo "%FORCE%" >>depends
+ echo "" >>depends
+ fi
}
delete_entry()