Merge pull request 'sync staging repos' (#8) from staging into master

Reviewed-on: #8

docker-compose.yml

@@ -42,4 +42,4 @@ services:
         ports:
             - "8080:80"
         volumes:
-            - ./nginx.conf:/config/nginx/site-confs/default.conf:ro
+            - ./nginx.conf:/config/nginx/site-confs/default.conf

downloadpackages.sh

@@ -8,7 +8,7 @@ fi
 
 printf "downloadpackages.sh\nusing %s/\$repo/os/\$arch for mirror.\n" "$mirror"
 
-repos="system world galaxy lib32 system-gremlins world-gremlins galaxy-gremlins lib32-gremlins"
+repos="system world galaxy lib32 system-gremlins world-gremlins galaxy-gremlins lib32-gremlins system-goblins world-goblins galaxy-goblins lib32-goblins"
 
 mkdir -p ./archives
 

overlay/main/fixtures/repos.json

@@ -5,7 +5,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "World-Gremlins",
+            "name": "world-gremlins",
             "bugs_project": 0, 
             "svn_root": "packages",
             "testing": true
@@ -17,7 +17,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "Galaxy-Gremlins",
+            "name": "galaxy-gremlins",
             "bugs_project": 0, 
             "svn_root": "packages",
             "testing": true
@@ -29,7 +29,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "System", 
+            "name": "system", 
             "bugs_project": 0, 
             "svn_root": "packages", 
             "testing": false
@@ -41,7 +41,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "World", 
+            "name": "world", 
             "bugs_project": 0, 
             "svn_root": "packages", 
             "testing": false
@@ -53,7 +53,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "Galaxy", 
+            "name": "galaxy", 
             "bugs_project": 0, 
             "svn_root": "packages", 
             "testing": false
@@ -65,7 +65,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "Lib32", 
+            "name": "lib32", 
             "bugs_project": 0, 
             "svn_root": "packages", 
             "testing": false
@@ -77,7 +77,7 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "Lib32-Gremlins", 
+            "name": "lib32-gremlins", 
             "bugs_project": 0, 
             "svn_root": "packages", 
             "testing": true
@@ -89,10 +89,58 @@
         "fields": {
             "bugs_category": 0, 
             "staging": false, 
-            "name": "System-Gremlins",
+            "name": "system-gremlins",
             "bugs_project": 0, 
             "svn_root": "packages", 
             "testing": true
         }
+    },
+    {
+        "pk": 9, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 0, 
+            "staging": true, 
+            "name": "system-goblins",
+            "bugs_project": 0, 
+            "svn_root": "packages", 
+            "testing": false
+        }
+    },
+    {
+        "pk": 10, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 0, 
+            "staging": true, 
+            "name": "world-goblins",
+            "bugs_project": 0, 
+            "svn_root": "packages", 
+            "testing": false
+        }
+    },
+    {
+        "pk": 11, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 0, 
+            "staging": true, 
+            "name": "galaxy-goblins",
+            "bugs_project": 0, 
+            "svn_root": "packages", 
+            "testing": false
+        }
+    },
+    {
+        "pk": 12, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 0, 
+            "staging": true, 
+            "name": "lib32-goblins",
+            "bugs_project": 0, 
+            "svn_root": "packages", 
+            "testing": false
+        }
     }
 ]

populatepackages.sh

@@ -8,7 +8,7 @@ fi
 
 printf "populatepackages.sh\nretrieving package files from %s\n" "$path"
 
-repos="system world galaxy lib32 system-gremlins world-gremlins galaxy-gremlins lib32-gremlins"
+repos="system world galaxy lib32 system-gremlins world-gremlins galaxy-gremlins lib32-gremlins system-goblins world-goblins galaxy-goblins lib32-goblins"
 
 for repo in $repos
 do

templates/packages/package_details.html

@@ -98,8 +98,8 @@
                     title="Browse packages for {{ pkg.arch.name }} architecture">{{ pkg.arch.name }}</a></td>
         </tr><tr>
             <th>Repository:</th>
-            <td><a href="/packages/?repo={{ pkg.repo.name|capfirst }}"
-                    title="Browse the {{ pkg.repo.name|capfirst }} repository">{{ pkg.repo.name|capfirst }}</a></td>
+            <td><a href="/packages/?repo={{ pkg.repo.name }}"
+                    title="Browse the {{ pkg.repo.name }} repository">{{ pkg.repo.name }}</a></td>
         </tr>
         {% if pkg.pkgname == pkg.pkgbase %}
         {% with splits=pkg.split_packages %}{% if splits %}

templates/packages/search.html

@@ -62,7 +62,7 @@
             {% for pkg in exact_matches %}
             <tr>
                 <td>{{ pkg.arch.name }}</td>
-                <td>{{ pkg.repo.name|capfirst }}</td>
+                <td>{{ pkg.repo.name }}</td>
                 <td>{% pkg_details_link pkg %}</td>
                 {% if pkg.flag_date %}
                 <td><span class="flagged" title="Flagged out-of-date">{{ pkg.full_version }}</span></td>
@@ -109,7 +109,7 @@
                     <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
                     {% endif %}
                     <td>{{ pkg.arch.name }}</td>
-                    <td>{{ pkg.repo.name|capfirst }}</td>
+                    <td>{{ pkg.repo.name }}</td>
                     <td>{% pkg_details_link pkg %}</td>
                     {% if pkg.flag_date %}
                     <td><span class="flagged" title="Flagged out-of-date">{{ pkg.full_version }}</span></td>