summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-06-30 15:32:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-06-30 15:32:39 +0000
commita3ef7423c5d8670da2c1c254383d33eb0f3a36e0 (patch)
tree0011bc80bade0bf3f7e079a00c531aa6b0966694
parente0259bb2d4db676bf30d558af91c14da30d3f003 (diff)
downloadurpmi-a3ef7423c5d8670da2c1c254383d33eb0f3a36e0.tar
urpmi-a3ef7423c5d8670da2c1c254383d33eb0f3a36e0.tar.gz
urpmi-a3ef7423c5d8670da2c1c254383d33eb0f3a36e0.tar.bz2
urpmi-a3ef7423c5d8670da2c1c254383d33eb0f3a36e0.tar.xz
urpmi-a3ef7423c5d8670da2c1c254383d33eb0f3a36e0.zip
add a test
-rw-r--r--t/data/SPECS/file-conflicts/p-1.spec27
-rw-r--r--t/data/SPECS/file-conflicts/p-2.spec36
2 files changed, 63 insertions, 0 deletions
diff --git a/t/data/SPECS/file-conflicts/p-1.spec b/t/data/SPECS/file-conflicts/p-1.spec
new file mode 100644
index 00000000..cddbe3d2
--- /dev/null
+++ b/t/data/SPECS/file-conflicts/p-1.spec
@@ -0,0 +1,27 @@
+Summary: x
+Name: p
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+BuildArch: noarch
+
+%description
+x
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/foo
+install -d $RPM_BUILD_ROOT/var/foo
+echo bar > $RPM_BUILD_ROOT/etc/foo/bar
+echo boo > $RPM_BUILD_ROOT/var/foo/boo
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+/etc/foo
+/var/foo
+
+
diff --git a/t/data/SPECS/file-conflicts/p-2.spec b/t/data/SPECS/file-conflicts/p-2.spec
new file mode 100644
index 00000000..a44aaaca
--- /dev/null
+++ b/t/data/SPECS/file-conflicts/p-2.spec
@@ -0,0 +1,36 @@
+Summary: x
+Name: p
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+BuildArch: noarch
+
+%description
+x
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/foo
+install -d $RPM_BUILD_ROOT/var
+echo bar > $RPM_BUILD_ROOT/etc/foo/bar
+echo boo > $RPM_BUILD_ROOT/etc/foo/boo
+ln -s ../etc/foo $RPM_BUILD_ROOT/var/foo
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pretrans
+if [ ! -L /var/foo ]; then
+ echo "handling by hand /var/foo migration"
+ mv /var/foo/* /etc/foo/
+ rmdir /var/foo
+ ln -s ../etc/foo /var/foo
+fi
+
+%files
+/etc/foo
+/var/foo
+
+