From ed6fbafb35ec9799ad182c45985355a2e0d67d50 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 30 Sep 2010 14:36:38 -0500
Subject: Update MirrorProtocol fixture data

Move it to the correct location and add the new field. Also tidy up some of
the instructions dealing with loading this data.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 README                                | 10 ++++++----
 main/fixtures/mirrorprotocols.json    | 23 -----------------------
 mirrors/fixtures/mirrorprotocols.json | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 main/fixtures/mirrorprotocols.json
 create mode 100644 mirrors/fixtures/mirrorprotocols.json

diff --git a/README b/README
index fd493b68..e517ffe6 100644
--- a/README
+++ b/README
@@ -44,19 +44,21 @@ will probably want the following:
 
 4. Sync the database to create it.
 
-        $ python manage.py syncdb
+        $ ./manage.py syncdb
 
 5. Migrate changes.
 
-        $ python manage.py migrate
+        $ ./manage.py migrate
 
 6. Load the fixtures to prepopulate some data.
 
-        $ python manage.py loaddata main/fixtures/arches.json main/fixtures/repos.json
+        $ ./manage.py loaddata main/fixtures/arches.json
+        # ./manage.py loaddata main/fixtures/repos.json
+        # ./manage.py loaddata mirrors/fixtures/mirrorprotocols.json
     
 7. Use the following commands to start a service instance
 
-        $ python manage.py runserver
+        $ ./manage.py runserver
 
 8. To optionally populate the database with real data:
 
diff --git a/main/fixtures/mirrorprotocols.json b/main/fixtures/mirrorprotocols.json
deleted file mode 100644
index 9e8932a8..00000000
--- a/main/fixtures/mirrorprotocols.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-    {
-        "pk": 2, 
-        "model": "main.mirrorprotocol", 
-        "fields": {
-            "protocol": "ftp"
-        }
-    }, 
-    {
-        "pk": 1, 
-        "model": "main.mirrorprotocol", 
-        "fields": {
-            "protocol": "http"
-        }
-    }, 
-    {
-        "pk": 3, 
-        "model": "main.mirrorprotocol", 
-        "fields": {
-            "protocol": "rsync"
-        }
-    }
-]
diff --git a/mirrors/fixtures/mirrorprotocols.json b/mirrors/fixtures/mirrorprotocols.json
new file mode 100644
index 00000000..35614b3a
--- /dev/null
+++ b/mirrors/fixtures/mirrorprotocols.json
@@ -0,0 +1,26 @@
+[
+    {
+        "pk": 1, 
+        "model": "mirrors.mirrorprotocol", 
+        "fields": {
+            "is_download": true, 
+            "protocol": "http"
+        }
+    }, 
+    {
+        "pk": 2, 
+        "model": "mirrors.mirrorprotocol", 
+        "fields": {
+            "is_download": true, 
+            "protocol": "ftp"
+        }
+    }, 
+    {
+        "pk": 3, 
+        "model": "mirrors.mirrorprotocol", 
+        "fields": {
+            "is_download": false, 
+            "protocol": "rsync"
+        }
+    }
+]
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf