Joey Hess
7f17765de3
debCdn switched from cdn.debian.net to http.debian.net, which seems to be better managed now.
...
Conflicts:
debian/changelog
2014-10-10 11:37:22 -04:00
Joey Hess
79ee61d958
stable suite changes
...
* Avoid encoding the current stable suite in propellor's code,
since that poses a difficult transition around the release,
and can easily be wrong if an older version of propellor is used.
Instead, the os property for a stable system includes the suite name
to use, eg Stable "wheezy".
* stdSourcesList uses the stable suite name, to avoid unwanted
immediate upgrades to the next stable release.
2014-10-10 11:27:54 -04:00
Joey Hess
1e22e178b4
a few other whitespace fixups
2014-10-08 13:19:53 -04:00
Joey Hess
6a674c79d7
fix some accidental uses of spaces, rather than tabs, for indentation
2014-10-08 13:14:21 -04:00
Joey Hess
21117d5e21
propellor spin
2014-10-06 19:44:19 -04:00
Joey Hess
7fcf4edeba
comment
2014-09-25 15:11:19 -04:00
Joey Hess
e5dd1f6414
propellor spin
2014-09-24 14:03:23 -04:00
Joey Hess
960dd0d1f8
propellor spin
2014-09-24 11:29:08 -04:00
Joey Hess
c96ba00822
propellor spin
2014-09-24 11:27:45 -04:00
Joey Hess
d1292a5786
propellor spin
2014-09-24 11:22:55 -04:00
Joey Hess
3fe6e0f8bd
propellor spin
2014-09-24 11:21:12 -04:00
Joey Hess
ffe36b68b4
propellor spin
2014-09-24 11:18:12 -04:00
Joey Hess
f6ac681da0
use Daemon.restarted consistently, and implement using Service.restarted
2014-09-23 13:21:53 -04:00
Joey Hess
28a966e4b5
propellor spin
2014-09-18 23:54:42 -04:00
Joey Hess
fc95968145
propellor spin
2014-09-18 23:50:13 -04:00
Joey Hess
f0409ae869
disable unattended upgrades for autobuilders that mix dpkg and cabal
...
upgrades of dpkg haskell libs can break cabal ones
2014-09-13 14:17:19 -04:00
Joey Hess
acd4638493
propellor spin
2014-09-10 23:01:19 -04:00
Joey Hess
d8367de73a
propellor spin
2014-09-10 22:56:42 -04:00
Joey Hess
599168ddcb
propellor spin
2014-09-08 15:20:53 -04:00
Joey Hess
f2bdab547e
propellor spin
2014-09-08 15:18:42 -04:00
Joey Hess
0126c41a53
propellor spin
2014-09-08 12:46:54 -04:00
Joey Hess
b21feb9e8d
propellor spin
2014-09-08 10:56:08 -04:00
Joey Hess
3cb9a60f89
propellor spin
2014-08-21 15:52:49 -04:00
Joey Hess
3822c9a2d7
propellor spin
2014-08-21 14:04:26 -04:00
Joey Hess
ceb56ac32b
keep warning of out of date after updating upstream/master, until it gets merged
2014-08-19 19:22:54 -04:00
Joey Hess
db1cf96dd7
remove origin remote after local clone
...
It's not useful, since it'll change to something that cannot be directly
merged with.
2014-08-19 19:03:05 -04:00
Joey Hess
d6320b8130
-X
2014-08-19 17:59:15 -04:00
Joey Hess
5d92ed6ea7
need to -s theirs or the merge is likely to fail
2014-08-19 17:57:32 -04:00
Joey Hess
d289a222d5
simpler merge
...
Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suitable for mergeing into the user's repo. No need for
manual diff, which can fail on eg, binaries or no changes.
2014-08-19 17:54:49 -04:00
Joey Hess
adf8b2ec34
need to connect up history
2014-08-19 17:51:34 -04:00
Joey Hess
1bf736293d
syntax
2014-08-19 17:17:36 -04:00
Joey Hess
7743da0c3d
syntax
2014-08-19 17:17:01 -04:00
Joey Hess
d54ee6c336
color message
2014-08-19 17:12:57 -04:00
Joey Hess
f72a1aa690
fixes
2014-08-19 17:09:11 -04:00
Joey Hess
1ada0f1014
fix ref name
2014-08-19 16:47:00 -04:00
Joey Hess
4ae9578e36
head file will end with a newline
2014-08-19 16:44:51 -04:00
Joey Hess
3c61c109fb
ugly workaround for lack of history in repo distributed with debian package
2014-08-19 16:40:04 -04:00
Joey Hess
e0bbb776bf
final fixes
2014-08-19 15:29:32 -04:00
Joey Hess
8e45b0f77b
warnings
2014-08-19 15:23:29 -04:00
Joey Hess
1830f501ee
debian upgrade handling
...
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version is available from origin.
2014-08-19 15:22:42 -04:00
Joey Hess
527ae1dc20
typo
2014-08-19 15:06:06 -04:00
Joey Hess
71ccd256da
stop removing privdata, it's no longer in master
2014-08-19 15:04:12 -04:00
Joey Hess
7d59dee469
local repo fully working now
2014-08-19 15:02:12 -04:00
Joey Hess
b6c5f54741
The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.
2014-08-19 14:35:38 -04:00
Joey Hess
08a3c52017
propellor spin
2014-07-23 12:48:46 -04:00
Joey Hess
ac46ab4d0c
propellor spin
2014-07-23 12:33:44 -04:00
Joey Hess
3d617fd98b
propellor spin
2014-07-23 12:33:11 -04:00
Joey Hess
41a23743e7
propellor spin
2014-07-23 12:27:38 -04:00
Joey Hess
dd32a63a07
propellor spin
2014-07-23 12:25:38 -04:00
Joey Hess
ecc275cfeb
propellor spin
2014-07-23 12:23:44 -04:00