aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Chary <corentin.chary@gmail.com>2013-04-02 10:17:37 +0200
committerCorentin Chary <corentin.chary@gmail.com>2013-04-02 10:17:37 +0200
commit0c59e72a8aeebfef9c35b478626ac46760cc3581 (patch)
tree8b9f1b77ceeab7ba3084a5e668cfca13560488be
parenteuscan_captcha: fix captcha (diff)
downloadeuscan-0c59e72a8aeebfef9c35b478626ac46760cc3581.tar.gz
euscan-0c59e72a8aeebfef9c35b478626ac46760cc3581.tar.bz2
euscan-0c59e72a8aeebfef9c35b478626ac46760cc3581.zip
djeuscan: small scan fixes
-rw-r--r--euscanwww/djeuscan/migrations/0030_auto__chg_field_category_description__chg_field_overlay_homepage__chg_.py205
-rw-r--r--euscanwww/djeuscan/migrations/0031_auto__chg_field_version_metadata_path.py187
-rw-r--r--euscanwww/djeuscan/models.py10
-rw-r--r--euscanwww/djeuscan/processing/scan/scan_portage.py24
4 files changed, 405 insertions, 21 deletions
diff --git a/euscanwww/djeuscan/migrations/0030_auto__chg_field_category_description__chg_field_overlay_homepage__chg_.py b/euscanwww/djeuscan/migrations/0030_auto__chg_field_category_description__chg_field_overlay_homepage__chg_.py
new file mode 100644
index 0000000..cd946b6
--- /dev/null
+++ b/euscanwww/djeuscan/migrations/0030_auto__chg_field_category_description__chg_field_overlay_homepage__chg_.py
@@ -0,0 +1,205 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Changing field 'Category.description'
+ db.alter_column('djeuscan_category', 'description', self.gf('django.db.models.fields.TextField')(null=True))
+
+ # Changing field 'Overlay.homepage'
+ db.alter_column('djeuscan_overlay', 'homepage', self.gf('django.db.models.fields.TextField')(null=True))
+
+ # Changing field 'Overlay.description'
+ db.alter_column('djeuscan_overlay', 'description', self.gf('django.db.models.fields.TextField')(null=True))
+
+ # Changing field 'Overlay.overlay_path'
+ db.alter_column('djeuscan_overlay', 'overlay_path', self.gf('django.db.models.fields.CharField')(max_length=256, null=True))
+
+ def backwards(self, orm):
+
+ # Changing field 'Category.description'
+ db.alter_column('djeuscan_category', 'description', self.gf('django.db.models.fields.TextField')(default=''))
+
+ # Changing field 'Overlay.homepage'
+ db.alter_column('djeuscan_overlay', 'homepage', self.gf('django.db.models.fields.TextField')(default=''))
+
+ # Changing field 'Overlay.description'
+ db.alter_column('djeuscan_overlay', 'description', self.gf('django.db.models.fields.TextField')(default=''))
+
+ # Changing field 'Overlay.overlay_path'
+ db.alter_column('djeuscan_overlay', 'overlay_path', self.gf('django.db.models.fields.CharField')(default='', max_length=256))
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'djeuscan.category': {
+ 'Meta': {'object_name': 'Category'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+ },
+ 'djeuscan.categorylog': {
+ 'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.euscanresult': {
+ 'Meta': {'object_name': 'EuscanResult'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.herd': {
+ 'Meta': {'object_name': 'Herd'},
+ 'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.herdlog': {
+ 'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+ 'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.log': {
+ 'Meta': {'object_name': 'Log'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+ },
+ 'djeuscan.maintainer': {
+ 'Meta': {'object_name': 'Maintainer'},
+ 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.maintainerlog': {
+ 'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+ 'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+ },
+ 'djeuscan.overlay': {
+ 'Meta': {'object_name': 'Overlay'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'overlay_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.package': {
+ 'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.problemreport': {
+ 'Meta': {'object_name': 'ProblemReport'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'message': ('django.db.models.fields.TextField', [], {}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.refreshpackagequery': {
+ 'Meta': {'object_name': 'RefreshPackageQuery'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.version': {
+ 'Meta': {'unique_together': "(['package', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+ 'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'handler': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'stabilization_candidate': ('django.db.models.fields.DateField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.versionlog': {
+ 'Meta': {'object_name': 'VersionLog'},
+ 'action': ('django.db.models.fields.IntegerField', [], {}),
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.worldlog': {
+ 'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ }
+ }
+
+ complete_apps = ['djeuscan'] \ No newline at end of file
diff --git a/euscanwww/djeuscan/migrations/0031_auto__chg_field_version_metadata_path.py b/euscanwww/djeuscan/migrations/0031_auto__chg_field_version_metadata_path.py
new file mode 100644
index 0000000..1c39724
--- /dev/null
+++ b/euscanwww/djeuscan/migrations/0031_auto__chg_field_version_metadata_path.py
@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Changing field 'Version.metadata_path'
+ db.alter_column('djeuscan_version', 'metadata_path', self.gf('django.db.models.fields.CharField')(max_length=256, null=True))
+
+ def backwards(self, orm):
+
+ # Changing field 'Version.metadata_path'
+ db.alter_column('djeuscan_version', 'metadata_path', self.gf('django.db.models.fields.CharField')(default='', max_length=256))
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'djeuscan.category': {
+ 'Meta': {'object_name': 'Category'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+ },
+ 'djeuscan.categorylog': {
+ 'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.euscanresult': {
+ 'Meta': {'object_name': 'EuscanResult'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.herd': {
+ 'Meta': {'object_name': 'Herd'},
+ 'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.herdlog': {
+ 'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+ 'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.log': {
+ 'Meta': {'object_name': 'Log'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+ },
+ 'djeuscan.maintainer': {
+ 'Meta': {'object_name': 'Maintainer'},
+ 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.maintainerlog': {
+ 'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+ 'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+ },
+ 'djeuscan.overlay': {
+ 'Meta': {'object_name': 'Overlay'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'overlay_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.package': {
+ 'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.problemreport': {
+ 'Meta': {'object_name': 'ProblemReport'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'message': ('django.db.models.fields.TextField', [], {}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.refreshpackagequery': {
+ 'Meta': {'object_name': 'RefreshPackageQuery'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.version': {
+ 'Meta': {'unique_together': "(['package', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+ 'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'handler': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'stabilization_candidate': ('django.db.models.fields.DateField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.versionlog': {
+ 'Meta': {'object_name': 'VersionLog'},
+ 'action': ('django.db.models.fields.IntegerField', [], {}),
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.worldlog': {
+ 'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ }
+ }
+
+ complete_apps = ['djeuscan'] \ No newline at end of file
diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py
index e455fad..e03d798 100644
--- a/euscanwww/djeuscan/models.py
+++ b/euscanwww/djeuscan/models.py
@@ -150,7 +150,7 @@ class Version(models.Model):
confidence = models.IntegerField(default=0)
ebuild_path = models.CharField(blank=True, max_length=256)
- metadata_path = models.CharField(blank=True, max_length=256)
+ metadata_path = models.CharField(null=True, blank=True, max_length=256)
# If this is not null then the version is a stabilization candidate
stabilization_candidate = models.DateField(
@@ -274,7 +274,7 @@ class EuscanResult(models.Model):
class Category(models.Model):
name = models.CharField(max_length=128, validators=[validate_category],
unique=True)
- description = models.TextField(blank=True)
+ description = models.TextField(blank=True, null=True)
class Meta:
verbose_name_plural = "categories"
@@ -286,9 +286,9 @@ class Category(models.Model):
class Overlay(models.Model):
name = models.CharField(max_length=128, validators=[validate_name],
unique=True)
- description = models.TextField(blank=True)
- homepage = models.TextField(blank=True)
- overlay_path = models.CharField(blank=True, max_length=256)
+ description = models.TextField(blank=True, null=True)
+ homepage = models.TextField(blank=True, null=True)
+ overlay_path = models.CharField(blank=True, null=True, max_length=256)
def __unicode__(self):
return self.name
diff --git a/euscanwww/djeuscan/processing/scan/scan_portage.py b/euscanwww/djeuscan/processing/scan/scan_portage.py
index 9efc8c2..84b9966 100644
--- a/euscanwww/djeuscan/processing/scan/scan_portage.py
+++ b/euscanwww/djeuscan/processing/scan/scan_portage.py
@@ -1,7 +1,6 @@
import subprocess
import os
-from os.path import join
import sys
import portage
@@ -221,9 +220,11 @@ class ScanPortage(object):
)
overlay_path = overlay_path or portage.settings["PORTDIR"]
- package_path = join(overlay_path, package.category, package.name)
- ebuild_path = join(package_path, "%s.ebuild" % cpv.split("/")[-1])
- metadata_path = join(package_path, "metadata.xml")
+ package_path = os.path.join(overlay_path, package.category, package.name)
+ ebuild_path = os.path.join(package_path, "%s.ebuild" % cpv.split("/")[-1])
+ metadata_path = os.path.join(package_path, "metadata.xml")
+ if not os.path.exists(metadata_path):
+ metadata_path = None
if not obj:
obj, created = Version.objects.get_or_create(
@@ -282,16 +283,7 @@ class ScanPortage(object):
if not self.purge_packages:
return
- packages = (
- Package.objects.values("id")
- .annotate(version_count=models.Count("version"))
- .filter(version_count=0)
- )
- packages = (
- Package.objects.filter(
- id__in=[package['id'] for package in packages]
- )
- )
+ packages = Package.objects.filter(n_packaged=0, n_overlay=0)
for package in packages:
self.logger.info('- [p] %s' % (package))
@@ -374,7 +366,7 @@ def populate_categories(logger):
portdir = portage.settings["PORTDIR"]
for cat in portage.settings.categories:
try:
- meta = MetaData(join(portdir, cat, "metadata.xml"))
+ meta = MetaData(os.path.join(portdir, cat, "metadata.xml"))
desc = meta.descriptions()[0]
except (IOError, IndexError):
desc = ""
@@ -397,7 +389,7 @@ def populate_overlays(logger):
if overlay in info:
obj.description = info[overlay]["description"]
obj.homepage = info[overlay]["homepage"]
- obj.overlay_path = join(l.config['storage'], overlay)
+ obj.overlay_path = os.path.join(l.config['storage'], overlay)
obj.save()
if created:
logger.info("+ [o] %s", overlay)