dragonresearch / rpki.net

Dragon Research Labs rpki.net RPKI toolkit
54 stars 30 forks source link

Randy wants release numbers to go with his update instructions #368

Closed sraustein closed 10 years ago

sraustein commented 11 years ago

have not dared to do anything since seeing thus

work0.psg.com:/usr/local/src/net/rpkid# svn up Updating '.': U buildtools/make-relaxng.py U buildtools/make-sql-schemas.py U buildtools/pylint.rc A buildtools/trang-not-found A buildtools/defstack.py U utils/print_rpki_manifest/Makefile.in U utils/print_rpki_manifest/print_rpki_manifest.c U utils/scan_roas/scan_roas.c U utils/scan_roas/Makefile.in U utils/print_roa/print_roa.c U utils/print_roa/Makefile.in U utils/uri/uri.c U utils/find_roa/Makefile.in U utils/find_roa/find_roa.c U utils/hashdir/Makefile.in U configure U configure.ac U doc/manual.pdf U doc/doc.RPKI.CA.Configuration.rootd U doc/doc.RPKI.CA.UI.GUI U doc/doc.RPKI.CA.UI U doc/doc.RPKI.Utils U doc/doc.RPKI.Installation A h A h/Makefile.in A h/rpki A h/rpki/roa.h A h/rpki/sk_manifest.h A h/rpki/manifest.h A h/rpki/sk_roa.h A h/README D rcynic/defstack.awk D rcynic/defasn1.h D rcynic/validation_status.awk C rcynic/defstack.h U rcynic/rcynic-html.py U rcynic/Makefile.in A rcynic/rcynic-svn.py U rcynic/rcynic.c U rcynic D scripts/Old/tls-server.py D scripts/Old/test-pow-tls.py D scripts/Old/tls-client.py U scripts/show-tracking-data.py U scripts/x509-dot.py U scripts/convert-from-entitydb-to-sql.py U scripts/format-application-x-rpki.py U scripts/find-roa-expiration.py U rpkid/rpki-sql-backup.py U rpkid/irbe_cli.py U rpkid/ext/POW.c U rpkid/tests/sql-cleaner.py A rpkid/tests/yamlconf.py U rpkid/tests/rcynic.conf U rpkid/tests/sql-dumper.py U rpkid/tests/Makefile.in U rpkid/tests/yamltest.py U rpkid/tests/smoketest.py U rpkid/tests/testpoke.py U rpkid/tests/myrpki-xml-parse-test.py U rpkid/tests D rpkid/rpki/ghostbuster.py D rpkid/rpki/roa.py D rpkid/rpki/manifest.py U rpkid/rpki/irdbd.py U rpkid/rpki/left_right.py U rpkid/rpki/irdb/models.py U rpkid/rpki/irdb/zookeeper.py U rpkid/rpki/irdb/init.py A rpkid/rpki/irdb/router.py U rpkid/rpki/oids.py U rpkid/rpki/sundial.py U rpkid/rpki/sql.py U rpkid/rpki/config.py U rpkid/rpki/rpkid.py U rpkid/rpki/publication.py U rpkid/rpki/async.py A rpkid/rpki/rpkid_tasks.py D rpkid/rpki/POW/_objects.py D rpkid/rpki/POW/_der.py D rpkid/rpki/POW/pkix.py D rpkid/rpki/POW/_oids.py D rpkid/rpki/POW/_simpledb.py U rpkid/rpki/POW/init.py U rpkid/rpki/http.py U rpkid/rpki/xml_utils.py U rpkid/rpki/adns.py U rpkid/rpki/ipaddrs.py U rpkid/rpki/rootd.py U rpkid/rpki/rcynic.py U rpkid/rpki/pubd.py U rpkid/rpki/gui/cacheview/views.py U rpkid/rpki/gui/cacheview/models.py A rpkid/rpki/gui/app/migrations A rpkid/rpki/gui/app/migrations/0001_initial.py A rpkid/rpki/gui/app/migrations/0002_autoadd_field_resourcecert_conf.py A rpkid/rpki/gui/app/migrations/0005_autochg_field_resourcecert_parent.py A rpkid/rpki/gui/app/migrations/0003_set_conf_from_parent.py A rpkid/rpki/gui/app/migrations/init.py A rpkid/rpki/gui/app/migrations/0004_auto__chg_field_resourcecert_conf.py U rpkid/rpki/gui/app/forms.py U rpkid/rpki/gui/app/range_list.py D rpkid/rpki/gui/app/templates/app/child_add_resource_form.html U rpkid/rpki/gui/app/templates/app/dashboard.html U rpkid/rpki/gui/app/templates/app/object_detail.html U rpkid/rpki/gui/app/glue.py U rpkid/rpki/gui/app/views.py U rpkid/rpki/gui/app/models.py U rpkid/rpki/gui/models.py U rpkid/rpki/mysql_import.py U rpkid/rpki/relaxng.py U rpkid/rpki/resource_set.py U rpkid/rpki/x509.py U rpkid/rpki/rpkic.py U rpkid/rpki/csv_utils.py U rpkid/rpki/up_down.py U rpkid/rpki/exceptions.py U rpkid/rpki/log.py U rpkid/rpki/old_irdbd.py U rpkid/examples/rsyncd.conf U rpkid/examples/rpki.conf U rpkid/rpki-start-servers.py U rpkid/Makefile.in U rpkid/portal-gui/settings.py.in A rpkid/portal-gui/manage.py U rpkid/portal-gui/Makefile.in U rpkid/portal-gui/rpki.wsgi.in A rpkid/portal-gui/scripts/rpki-manage.in U rpkid/portal-gui/scripts/rpkigui-rcynic.py U rpkid/portal-gui/scripts/rpkigui-check-expired.py U rpkid/portal-gui/scripts U rpkid/portal-gui/apache.conf.in U rpkid/rpki-sql-setup.py U rpkid/setup.py U rtr-origin/Makefile.in U rtr-origin/rtr-origin.py U . Updated to revision 4891. Summary of conflicts: Tree conflicts: 1

Trac ticket #353 component build priority minor, owner sra, created by randy on 2012-11-21T03:46:25Z, last modified 2013-11-22T19:00:32Z

sraustein commented 11 years ago

From the conflict warning, I suspect you ignored the part about running "make distclean" before running "svn update".

{{{

!sh

$ rm rcynic/defstack.h $ svn update $ svn revert rcynic/defstack.h $ svn update }}}

If that doesn't work, there are other incantations to tell subversion how to resolve the merge conflict, probably something like:

{{{

!sh

$ svn resolve --accept=theirs-full rcynic/defstack.h $ svn update }}}

But I think svn revert is simpler in this case, since it's just deletion of a file.

Trac comment by sra on 2012-11-21T10:21:52Z

sraustein commented 11 years ago

work0.psg.com:/usr/local/src/net/rpkid# svn up Updating '.': At revision 4891. work0.psg.com:/usr/local/src/net/rpkid# rm rcynic/defstack.h rm: rcynic/defstack.h: No such file or directory work0.psg.com:/usr/local/src/net/rpkid# svn revert rcynic/defstack.h Reverted 'rcynic/defstack.h' work0.psg.com:/usr/local/src/net/rpkid# svn up Updating '.': At revision 4891.

...

checking for PyYAML... yes checking for vobject... yes checking for Django South... no configure: WARNING: The RPKI CA tools require Django South 0.7.6 or higher. configure: WARNING: If you do not wish to install the RPKI CA tools, please specify --disable-ca-tools as an argument to this configure script. configure: error: Please correct the problems above then re-run this configuration script. work0.psg.com:/usr/local/src/net/rpkid# make make: no target to make.

whoops

more later

Trac comment by randy on 2012-11-21T10:29:43Z

sraustein commented 11 years ago

so where th eheck is django south?

i upgraded www/py-django

Trac comment by randy on 2012-11-21T12:51:44Z

sraustein commented 11 years ago

databases/py-south

Trac comment by randy on 2012-11-21T12:52:52Z

sraustein commented 11 years ago

ok, rebuilt and restarted

Trac comment by randy on 2012-11-21T16:18:32Z

sraustein commented 11 years ago

This appears to have been failure to follow upgrade instructions provided via email.

I suppose we could have put the instructions on the web site, but we have little evidence to suggest that people who ignore instructions sent directly to them via email will pay attention to instructions posted on a web site. Besides, we'd need some kind of meaningful release numbering system with a bump between each version requiring any kind of upgrade magic for this to be meaningful, which would in turn play hell with any kind of meaningful release numbering if and when we got around to it.

In the "what would Steve do?" category: make or autoconf could do some kind of magic to detect what version is currently installed and walk user through upgrade process. See previous tickets regarding installation wizards, on steroids. Cool idea, kind of like it, dunno if it's worth the effort.

Trac comment by sra on 2012-11-26T15:05:06Z

sraustein commented 11 years ago

the problem is not lack of memory of instructions. the problem is that one has no idea where one is in the 'release' stream and which instructions apply to which transition. this is especially true on work0, where michael is also doing updating.

i would not be so surly about it if i did not think that this also affects users.

Trac comment by randy on 2012-11-26T15:27:26Z

sraustein commented 11 years ago

Perhaps you'd better explain what it is that you expect.

Trac comment by sra on 2012-11-28T00:59:07Z

sraustein commented 11 years ago

release numbers and a page of "to update to rel X". so if i am at N, i know to apply all conversions O-X, unless some particular conversion says it subsumes others.

Trac comment by randy on 2012-11-28T02:40:01Z

sraustein commented 11 years ago

Reclassifying this as a request for a build-system enhancement called "release numbers".

Trac comment by sra on 2012-11-28T22:45:47Z

sraustein commented 10 years ago

We've had, not "release numbers" exactly, but version numbers for quite a while now.

Trac comment by sra on 2013-11-22T19:00:32Z

sraustein commented 10 years ago

Closed with resolution fixed